refactor: replace builtin package with fluxinit/static

examples/library/library_example_test.go

@@ -1,7 +1,7 @@
 package library_test
 
 import (
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 )
 
 // TODO (faith): https://github.com/influxdata/flux/issues/2476; this is not a test function,

execute/executor_test.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/codes"
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/interpreter"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/plan"

fluxinit/init.go

@@ -1,18 +1,24 @@
+// Package fluxinit is used to initialize the flux library for compilation and
+// execution of Flux. The FluxInit function should be called exactly once in a
+// process.
 package fluxinit
 
 import (
 	"github.com/influxdata/flux/runtime"
 	_ "github.com/influxdata/flux/stdlib"
 )
 
-// FluxInit() prepares the runtime for compilation and execution of flux. This
-// is a costly step and should only be performed if the intention is to compile
-// and execute flux code.
+// The FluxInit() function prepares the runtime for compilation and execution
+// of Flux. This is a costly step and should only be performed if the intention
+// is to compile and execute flux code.
 //
-// Importing this package and calling FluxInit is equivalent to importing the
-// "builtin" package. It draws in the standard library functions, which
-// register themselves in init() functions, then performs the final steps
-// necessary to prepare for executing flux.
+// This package imports the standard library. These modules register themselves
+// in go init() functions. This package must ensure all required standard
+// library functions are imported.
+//
+// As a convenience, the fluxinit/static package can be imported for use cases
+// where static initialization is okay, such as tests.
+
 func FluxInit() {
 	runtime.FinalizeBuiltIns()
 }

fluxinit/static/static.go

@@ -0,0 +1,11 @@
+// The fluxinit/static package can be imported in test cases and other uses
+// cases where it is okay to always initialize flux.
+package static
+
+import (
+	"github.com/influxdata/flux/fluxinit"
+)
+
+func init() {
+	fluxinit.FluxInit()
+}

builtin/builtin_test.go → fluxinit/static/static_test.go

@@ -1,9 +1,9 @@
-package builtin_test
+package static_test
 
 import (
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 )
 
 func TestBuiltins(t *testing.T) {

internal/cmd/test_rewriter/main.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/influxdata/flux"
 	"github.com/influxdata/flux/ast"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/codes"
 	"github.com/influxdata/flux/dependencies/filesystem"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/internal/errors"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"

internal/spec/build_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/internal/spec"
 	"github.com/influxdata/flux/runtime"
 )

interpreter/package_test.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/codes"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/internal/errors"
 	"github.com/influxdata/flux/interpreter"
 	"github.com/influxdata/flux/interpreter/interptest"

lang/compiler_test.go

@@ -12,11 +12,11 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/flux"
 	"github.com/influxdata/flux/ast"
-	_ "github.com/influxdata/flux/builtin"
 	fcsv "github.com/influxdata/flux/csv"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/mock"

lang/query_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

plan/builtin_test.go

@@ -1,6 +1,6 @@
 package plan_test
 
 import (
-	// We need to import the builtins for the tests to work.
-	_ "github.com/influxdata/flux/builtin"
+	// We need to init flux for the tests to work.
+	_ "github.com/influxdata/flux/fluxinit/static"
 )

runtime/runtime_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/interpreter"
 	"github.com/influxdata/flux/parser"
 	"github.com/influxdata/flux/runtime"

stdlib/contrib/chobbs/discord/discord_test.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

stdlib/contrib/sranka/opsgenie/opsgenie_test.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	_ "github.com/influxdata/flux/csv"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

stdlib/contrib/sranka/sensu/sensu_test.go

@@ -13,9 +13,9 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	_ "github.com/influxdata/flux/csv"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

stdlib/contrib/sranka/teams/teams_test.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	_ "github.com/influxdata/flux/csv"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

stdlib/contrib/sranka/telegram/telegram_test.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	_ "github.com/influxdata/flux/csv"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

stdlib/contrib/tomhollingworth/events/duration_test.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin" // We need to import the builtins for the tests to work.
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static" // We need to init flux for the tests to work.
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/contrib/tomhollingworth/events"
 	"github.com/influxdata/flux/stdlib/influxdata/influxdb"

stdlib/csv/from_test.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin" // We need to import the builtins for the tests to work.
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static" // We need to init flux for the tests to work.
 	"github.com/influxdata/flux/mock"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/csv"

stdlib/experimental/geo/getgrid_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/semantic"
 	"github.com/influxdata/flux/stdlib/experimental/geo"

stdlib/experimental/geo/getlevel_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/experimental/geo"
 	"github.com/influxdata/flux/values"

stdlib/experimental/geo/s2CellIDToken_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/experimental/geo"
 	"github.com/influxdata/flux/values"

stdlib/experimental/geo/s2CellLatLon_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/experimental/geo"
 	"github.com/influxdata/flux/values"

stdlib/experimental/geo/stContains_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/semantic"
 	"github.com/influxdata/flux/stdlib/experimental/geo"

stdlib/experimental/geo/stDistance_test.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/semantic"
 	"github.com/influxdata/flux/stdlib/experimental/geo"

stdlib/experimental/geo/stLength_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/experimental/geo"
 	"github.com/influxdata/flux/values"

stdlib/experimental/group_test.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/experimental"
 	"github.com/influxdata/flux/stdlib/influxdata/influxdb"

stdlib/experimental/http/get_test.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/dependencies/url"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/runtime"
 )
 

stdlib/experimental/mqtt/to_test.go

@@ -7,9 +7,9 @@ import (
 
 	MQTT "github.com/eclipse/paho.mqtt.golang"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin" // We need to import the builtins for the tests to work.
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static" // We need to init flux for the tests to work.
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/experimental/mqtt"
 	"github.com/influxdata/flux/stdlib/influxdata/influxdb"

stdlib/generate/from_test.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/interpreter"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/runtime"

stdlib/http/post_test.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/dependencies/url"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/runtime"
 )
 

stdlib/influxdata/influxdb/builtin_test.go

@@ -1,6 +1,6 @@
 package influxdb_test
 
 import (
-	// We need to import the builtins for the tests to work.
-	_ "github.com/influxdata/flux/builtin"
+	// We need to init flux for the tests to work.
+	_ "github.com/influxdata/flux/fluxinit/static"
 )

stdlib/influxdata/influxdb/v1/from_influx_json_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin" // We need to import the builtins for the tests to work.
+	_ "github.com/influxdata/flux/fluxinit/static" // We need to init flux for the tests to work.
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/influxdata/influxdb/v1"
 )

stdlib/internal/promql/join_test.go

@@ -8,9 +8,9 @@ import (
 	"github.com/google/go-cmp/cmp"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/interpreter"
 	"github.com/influxdata/flux/stdlib/experimental"
 	"github.com/influxdata/flux/values"

stdlib/json/encode_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	_ "github.com/influxdata/flux/builtin"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/runtime"
 )
 

stdlib/kafka/to_test.go

@@ -8,11 +8,11 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin" // We need to import the builtins for the tests to work.
 	"github.com/influxdata/flux/dependencies/dependenciestest"
 	"github.com/influxdata/flux/dependencies/url"
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static" // We need to init flux for the tests to work.
 	"github.com/influxdata/flux/plan"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/influxdata/influxdb"

stdlib/pagerduty/pagerduty_test.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	_ "github.com/influxdata/flux/csv"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

stdlib/slack/slack_test.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin"
 	_ "github.com/influxdata/flux/csv"
 	"github.com/influxdata/flux/dependencies/dependenciestest"
+	_ "github.com/influxdata/flux/fluxinit/static"
 	"github.com/influxdata/flux/lang"
 	"github.com/influxdata/flux/memory"
 	"github.com/influxdata/flux/runtime"

stdlib/socket/from_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/influxdata/flux/stdlib/socket"
 	"github.com/influxdata/flux/stdlib/universe"
 
-	_ "github.com/influxdata/flux/builtin" // We need to import the builtins for the tests to work.
+	_ "github.com/influxdata/flux/fluxinit/static" // We need to init flux for the tests to work.
 )
 
 func TestFromSocket_NewQuery(t *testing.T) {

stdlib/sql/to_test.go

@@ -7,11 +7,11 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/influxdata/flux"
-	_ "github.com/influxdata/flux/builtin" // We need to import the builtins for the tests to work.
 	"github.com/influxdata/flux/dependencies/dependenciestest"
 	"github.com/influxdata/flux/dependencies/url"
 	"github.com/influxdata/flux/execute"
 	"github.com/influxdata/flux/execute/executetest"
+	_ "github.com/influxdata/flux/fluxinit/static" // We need to init flux for the tests to work.
 	"github.com/influxdata/flux/plan"
 	"github.com/influxdata/flux/querytest"
 	"github.com/influxdata/flux/stdlib/influxdata/influxdb"