Move everything to one command based on feedback

Signed-off-by: Daniel González Lopes <[email protected]>

cmd/cloud.go

@@ -371,10 +371,7 @@ func getCmdCloud(gs *state.GlobalState) *cobra.Command {
   $ {{.}} cloud run script.js
 
   # Run a k6 archive in the Grafana Cloud k6
-  $ {{.}} cloud run archive.tar
- 
-  # Create a new cloud-ready k6 script
-  $ {{.}} cloud new script.js`[1:])
+  $ {{.}} cloud run archive.tar`[1:])
 
 	cloudCmd := &cobra.Command{
 		Use:   "cloud",
@@ -397,7 +394,6 @@ service. Be sure to run the "k6 cloud login" command prior to authenticate with
 	cloudCmd.AddCommand(getCmdCloudRun(c))
 	cloudCmd.AddCommand(getCmdCloudLogin(gs))
 	cloudCmd.AddCommand(getCmdCloudUpload(c))
-	cloudCmd.AddCommand(getCmdCloudNew(c))
 
 	cloudCmd.Flags().SortFlags = false
 	cloudCmd.Flags().AddFlagSet(c.flagSet())

cmd/new.go

@@ -16,13 +16,15 @@ type newScriptCmd struct {
 	gs             *state.GlobalState
 	overwriteFiles bool
 	templateType   string
+	projectID      string
 }
 
 func (c *newScriptCmd) flagSet() *pflag.FlagSet {
 	flags := pflag.NewFlagSet("", pflag.ContinueOnError)
 	flags.SortFlags = false
 	flags.BoolVarP(&c.overwriteFiles, "force", "f", false, "overwrite existing files")
 	flags.StringVar(&c.templateType, "template", "minimal", "template type (choices: minimal, protocol, browser)")
+	flags.StringVar(&c.projectID, "project-id", "", "specify the Grafana Cloud project ID for the test")
 	return flags
 }
 
@@ -52,7 +54,9 @@ func (c *newScriptCmd) run(cmd *cobra.Command, args []string) error {
 	}
 
 	argsStruct := templates.TemplateArgs{
-		ScriptName: target,
+		ScriptName:  target,
+		EnableCloud: c.projectID != "",
+		ProjectID:   c.projectID,
 	}
 
 	if err := templates.ExecuteTemplate(fd, tmpl, argsStruct); err != nil {
@@ -71,7 +75,10 @@ func getCmdNewScript(gs *state.GlobalState) *cobra.Command {
 	$ {{.}} new --template minimal
   
 	# Overwrite an existing file with a protocol-based script
-	$ {{.}} new -f --template protocol test.js`[1:])
+	$ {{.}} new -f --template protocol test.js
+	
+	# Create a cloud-ready script with a specific project ID
+	$ {{.}} new --project-id 12315`[1:])
 
 	initCmd := &cobra.Command{
 		Use:   "new [file]",

cmd/new_test.go

@@ -93,3 +93,28 @@ func TestNewScriptCmd_FileExists_Overwrite(t *testing.T) {
 	assert.Contains(t, string(data), "export const options = {")
 	assert.Contains(t, string(data), "export default function() {")
 }
+
+func TestNewScriptCmd_InvalidTemplateType(t *testing.T) {
+	t.Parallel()
+
+	ts := tests.NewGlobalTestState(t)
+	ts.CmdArgs = []string{"k6", "new", "--template", "invalid-template"}
+
+	ts.ExpectedExitCode = -1
+
+	newRootCommand(ts.GlobalState).execute()
+	assert.Contains(t, ts.Stderr.String(), "invalid template type")
+}
+func TestNewScriptCmd_ProjectID(t *testing.T) {
+	t.Parallel()
+
+	ts := tests.NewGlobalTestState(t)
+	ts.CmdArgs = []string{"k6", "new", "--project-id", "1422"}
+
+	newRootCommand(ts.GlobalState).execute()
+
+	data, err := fsext.ReadFile(ts.FS, defaultNewScriptName)
+	require.NoError(t, err)
+
+	assert.Contains(t, string(data), "projectID: 1422")
+}