Move BuildEnvMap to cmd/state

To avoid increasing the size of lib/.

See #2821 (comment)

cmd/config_consolidation_test.go

@@ -489,7 +489,7 @@ func runTestCase(t *testing.T, testCase configConsolidationTestCase, subCmd stri
 
 	ts := tests.NewGlobalTestState(t)
 	ts.CmdArgs = append([]string{"k6", subCmd}, testCase.options.cli...)
-	ts.Env = lib.BuildEnvMap(testCase.options.env)
+	ts.Env = state.BuildEnvMap(testCase.options.env)
 	if testCase.options.fs != nil {
 		ts.GlobalState.FS = testCase.options.fs
 	}

cmd/runtime_options.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/pflag"
 	"gopkg.in/guregu/null.v3"
 
+	"go.k6.io/k6/cmd/state"
 	"go.k6.io/k6/lib"
 )
 
@@ -113,7 +114,7 @@ func getRuntimeOptions(flags *pflag.FlagSet, environment map[string]string) (lib
 		return opts, err
 	}
 	for _, kv := range envVars {
-		k, v := lib.ParseEnvKeyValue(kv)
+		k, v := state.ParseEnvKeyValue(kv)
 		// Allow only alphanumeric ASCII variable names for now
 		if !userEnvVarName.MatchString(k) {
 			return opts, fmt.Errorf("invalid environment variable name '%s'", k)

lib/env.go → cmd/state/env.go

@@ -1,4 +1,4 @@
-package lib
+package state
 
 import "strings"
 

cmd/state/state.go

@@ -13,7 +13,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 
-	"go.k6.io/k6/lib"
 	"go.k6.io/k6/ui/console"
 )
 
@@ -77,7 +76,7 @@ func NewGlobalState(ctx context.Context) *GlobalState {
 		IsTTY:  stderrTTY,
 	}
 
-	env := lib.BuildEnvMap(os.Environ())
+	env := BuildEnvMap(os.Environ())
 	_, noColorsSet := env["NO_COLOR"] // even empty values disable colors
 	logger := &logrus.Logger{
 		Out: stderr,