Skip binary provisioning for the run command (#4731)

Author: pablochacin

internal/cmd/launcher.go

@@ -56,19 +56,20 @@ func NewLauncher(gs *state.GlobalState) *Launcher {
 func (l *Launcher) Launch() {
 	// If binary provisioning is not enabled, continue with the regular k6 execution path
 	if !l.gs.Flags.BinaryProvisioning {
-		l.gs.Logger.Debug("Binary provisioning feature is disabled")
+		l.gs.Logger.Debug("Binary provisioning feature is disabled.")
 		l.commandExecutor.run(l.gs)
 		return
 	}
 
-	l.gs.Logger.Info("Binary provisioning feature is enabled. If it's required, k6 will provision a new binary")
+	l.gs.Logger.
+		Debug("Binary provisioning feature is enabled.")
 
 	deps, err := analyze(l.gs, l.gs.CmdArgs[1:])
 	if err != nil {
 		l.gs.Logger.
 			WithError(err).
-			Error("Failed to analyze the required dependencies. Please, make sure to report this issue by" +
-				" opening a bug report.")
+			Error("Binary provisioning is enabled but it failed to analyze the dependencies." +
+				" Please, make sure to report this issue by opening a bug report.")
 		l.gs.OSExit(1)
 		return // this is required for testing
 	}
@@ -84,14 +85,14 @@ func (l *Launcher) Launch() {
 
 	l.gs.Logger.
 		WithField("deps", deps).
-		Info("The current k6 binary doesn't satisfy all the required dependencies, it is required to" +
-			" provision a new binary.")
+		Info("The current k6 binary doesn't satisfy all dependencies, it is required to" +
+			" provision a custom binary.")
 
 	customBinary, err := l.provision(l.gs, deps)
 	if err != nil {
 		l.gs.Logger.
 			WithError(err).
-			Error("Failed to provision a new k6 binary with required dependencies." +
+			Error("Failed to provision a k6 binary with required dependencies." +
 				" Please, make sure to report this issue by opening a bug report.")
 		l.gs.OSExit(1)
 		return
@@ -194,7 +195,7 @@ func k6buildProvision(gs *state.GlobalState, deps k6deps.Dependencies) (commandE
 	}
 
 	if config.BuildServiceAuth == "" {
-		return nil, errors.New("k6 cloud token is required when Binary provisioning feature is enabled." +
+		return nil, errors.New("k6 cloud token is required when the Binary provisioning feature is enabled." +
 			" Set K6_CLOUD_TOKEN environment variable or execute the `k6 cloud login` command")
 	}
 
@@ -249,6 +250,8 @@ func analyze(gs *state.GlobalState, args []string) (k6deps.Dependencies, error)
 	}
 
 	if !isScriptRequired(args) {
+		gs.Logger.
+			Debug("The command to execute does not require Binary provisioning")
 		return k6deps.Dependencies{}, nil
 	}
 
@@ -300,7 +303,7 @@ func isScriptRequired(args []string) bool {
 				}
 			}
 			return true
-		case "run", "archive", "inspect":
+		case "archive", "inspect":
 			return true
 		}
 	}

internal/cmd/launcher_test.go

@@ -90,7 +90,7 @@ func TestLauncherLaunch(t *testing.T) {
 	}{
 		{
 			name:            "disable binary provisioning",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			disableBP:       true,
 			script:          fakerTest,
 			expectProvision: false,
@@ -100,7 +100,7 @@ func TestLauncherLaunch(t *testing.T) {
 		},
 		{
 			name:            "execute binary provisioned",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			script:          fakerTest,
 			expectProvision: true,
 			expectK6Run:     true,
@@ -109,7 +109,7 @@ func TestLauncherLaunch(t *testing.T) {
 		},
 		{
 			name:            "require unsatisfied k6 version",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			script:          requireUnsatisfiedK6Version,
 			expectProvision: true,
 			expectK6Run:     true,
@@ -118,7 +118,7 @@ func TestLauncherLaunch(t *testing.T) {
 		},
 		{
 			name:            "require satisfied k6 version",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			script:          requireSatisfiedK6Version,
 			expectProvision: false,
 			expectK6Run:     false,
@@ -127,7 +127,7 @@ func TestLauncherLaunch(t *testing.T) {
 		},
 		{
 			name:            "script with no dependencies",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			script:          noDepsTest,
 			expectProvision: false,
 			expectK6Run:     false,
@@ -143,8 +143,16 @@ func TestLauncherLaunch(t *testing.T) {
 			expectOsExit:    0,
 		},
 		{
-			name:            "failed binary provisioning",
+			name:            "binary provisioning is not enabled for run command",
 			k6Cmd:           "run",
+			expectProvision: false,
+			expectK6Run:     false,
+			expectDefault:   true,
+			expectOsExit:    0,
+		},
+		{
+			name:            "failed binary provisioning",
+			k6Cmd:           "cloud",
 			script:          fakerTest,
 			provisionError:  errors.New("test error"),
 			expectProvision: true,
@@ -154,7 +162,7 @@ func TestLauncherLaunch(t *testing.T) {
 		},
 		{
 			name:            "failed k6 execution",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			script:          fakerTest,
 			k6ReturnCode:    108,
 			expectProvision: true,
@@ -164,7 +172,7 @@ func TestLauncherLaunch(t *testing.T) {
 		},
 		{
 			name:            "missing input script",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			k6Args:          []string{},
 			script:          "",
 			expectProvision: false,
@@ -174,7 +182,7 @@ func TestLauncherLaunch(t *testing.T) {
 		},
 		{
 			name:            "script in stdin",
-			k6Cmd:           "run",
+			k6Cmd:           "cloud",
 			k6Args:          []string{"-"},
 			script:          "",
 			expectProvision: false,
@@ -314,7 +322,7 @@ func TestScriptNameFromArgs(t *testing.T) {
 		},
 		{
 			name:     "complex case with multiple flags",
-			args:     []string{"-v", "--quiet", "run", "-o", "output.json", "--console-output", "loadtest.log", "script.js", "--tag", "env=staging"},
+			args:     []string{"-v", "--quiet", "cloud", "run", "-o", "output.json", "--console-output", "loadtest.log", "script.js", "--tag", "env=staging"},
 			expected: "script.js",
 		},
 		{
@@ -370,26 +378,36 @@ func TestIsScriptRequired(t *testing.T) {
 		{
 			name:     "run command",
 			args:     []string{"run", "script.js"},
+			expected: false,
+		},
+		{
+			name:     "cloud command",
+			args:     []string{"cloud", "script.js"},
+			expected: true,
+		},
+		{
+			name:     "cloud run command",
+			args:     []string{"cloud", "run", "script.js"},
 			expected: true,
 		},
 		{
 			name:     "flag before command",
-			args:     []string{"-v", "run", "script.js"},
+			args:     []string{"-v", "cloud", "script.js"},
 			expected: true,
 		},
 		{
 			name:     "verbose flag before command",
-			args:     []string{"--verbose", "run", "script.js"},
+			args:     []string{"--verbose", "cloud", "script.js"},
 			expected: true,
 		},
 		{
 			name:     "cloud run with flag in the middle",
-			args:     []string{"cloud", "-v", "run", "archive.tar"},
+			args:     []string{"cloud", "-v", "cloud", "archive.tar"},
 			expected: true,
 		},
 		{
-			name:     "cloud command",
-			args:     []string{"cloud", "script.js"},
+			name:     "cloud upload command",
+			args:     []string{"cloud", "upload", "script.js"},
 			expected: true,
 		},
 		{
@@ -409,7 +427,7 @@ func TestIsScriptRequired(t *testing.T) {
 		},
 		{
 			name:     "complex case with multiple flags",
-			args:     []string{"-v", "--quiet", "run", "-o", "output.json", "--console-output", "loadtest.log", "script.js", "--tag", "env=staging"},
+			args:     []string{"-v", "--quiet", "cloud", "run", "-o", "output.json", "--console-output", "loadtest.log", "script.js", "--tag", "env=staging"},
 			expected: true,
 		},
 	}