-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Refactor new
command
#4153
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor new
command
#4153
Changes from 10 commits
d254f00
e7e95f1
c3f84ba
fea3e7f
b1af40f
b3e99b8
6423d09
1d8d321
5cf5916
beda4b1
9b0ab6d
833e52f
c0fc8d0
bd121da
4c62035
3a63869
9b26b9a
d0ae761
a5706c4
a6ed6c9
20f58ca
34b8624
5e08739
5cdb186
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,99 +2,33 @@ package cmd | |
|
||
import ( | ||
"fmt" | ||
"path" | ||
"text/template" | ||
|
||
"github.com/fatih/color" | ||
"github.com/spf13/cobra" | ||
"github.com/spf13/pflag" | ||
templates "go.k6.io/k6/cmd/newtemplates" | ||
"go.k6.io/k6/cmd/state" | ||
"go.k6.io/k6/lib/fsext" | ||
) | ||
|
||
const defaultNewScriptName = "script.js" | ||
|
||
//nolint:gochecknoglobals | ||
var defaultNewScriptTemplate = template.Must(template.New("new").Parse(`import http from 'k6/http'; | ||
import { sleep } from 'k6'; | ||
|
||
export const options = { | ||
// A number specifying the number of VUs to run concurrently. | ||
vus: 10, | ||
// A string specifying the total duration of the test run. | ||
duration: '30s', | ||
|
||
// The following section contains configuration options for execution of this | ||
// test script in Grafana Cloud. | ||
// | ||
// See https://grafana.com/docs/grafana-cloud/k6/get-started/run-cloud-tests-from-the-cli/ | ||
// to learn about authoring and running k6 test scripts in Grafana k6 Cloud. | ||
// | ||
// cloud: { | ||
// // The ID of the project to which the test is assigned in the k6 Cloud UI. | ||
// // By default tests are executed in default project. | ||
// projectID: "", | ||
// // The name of the test in the k6 Cloud UI. | ||
// // Test runs with the same name will be grouped. | ||
// name: "{{ .ScriptName }}" | ||
// }, | ||
|
||
// Uncomment this section to enable the use of Browser API in your tests. | ||
// | ||
// See https://grafana.com/docs/k6/latest/using-k6-browser/running-browser-tests/ to learn more | ||
// about using Browser API in your test scripts. | ||
// | ||
// scenarios: { | ||
// // The scenario name appears in the result summary, tags, and so on. | ||
// // You can give the scenario any name, as long as each name in the script is unique. | ||
// ui: { | ||
// // Executor is a mandatory parameter for browser-based tests. | ||
// // Shared iterations in this case tells k6 to reuse VUs to execute iterations. | ||
// // | ||
// // See https://grafana.com/docs/k6/latest/using-k6/scenarios/executors/ for other executor types. | ||
// executor: 'shared-iterations', | ||
// options: { | ||
// browser: { | ||
// // This is a mandatory parameter that instructs k6 to launch and | ||
// // connect to a chromium-based browser, and use it to run UI-based | ||
// // tests. | ||
// type: 'chromium', | ||
// }, | ||
// }, | ||
// }, | ||
// } | ||
}; | ||
|
||
// The function that defines VU logic. | ||
// | ||
// See https://grafana.com/docs/k6/latest/examples/get-started-with-k6/ to learn more | ||
// about authoring k6 scripts. | ||
// | ||
export default function() { | ||
http.get('https://test.k6.io'); | ||
sleep(1); | ||
} | ||
`)) | ||
|
||
type initScriptTemplateArgs struct { | ||
ScriptName string | ||
} | ||
|
||
// newScriptCmd represents the `k6 new` command | ||
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.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 | ||
} | ||
|
||
func (c *newScriptCmd) run(cmd *cobra.Command, args []string) error { //nolint:revive | ||
func (c *newScriptCmd) run(_ *cobra.Command, args []string) error { | ||
target := defaultNewScriptName | ||
if len(args) > 0 { | ||
target = args[0] | ||
|
@@ -104,64 +38,72 @@ func (c *newScriptCmd) run(cmd *cobra.Command, args []string) error { //nolint:r | |
if err != nil { | ||
return err | ||
} | ||
|
||
if fileExists && !c.overwriteFiles { | ||
return fmt.Errorf("%s already exists, please use the `--force` flag if you want overwrite it", target) | ||
return fmt.Errorf("%s already exists. Use the `--force` flag to overwrite", target) | ||
} | ||
|
||
fd, err := c.gs.FS.Create(target) | ||
if err != nil { | ||
return err | ||
} | ||
defer func() { | ||
_ = fd.Close() // we may think to check the error and log | ||
if cerr := fd.Close(); cerr != nil { | ||
if _, err := fmt.Fprintf(c.gs.Stderr, "error closing file: %v\n", cerr); err != nil { | ||
panic(fmt.Sprintf("error writing error message to stderr: %v", err)) | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd try to avoid the use of There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Gotcha! I removed the panic 👀 |
||
}() | ||
|
||
if err := defaultNewScriptTemplate.Execute(fd, initScriptTemplateArgs{ | ||
ScriptName: path.Base(target), | ||
}); err != nil { | ||
tm, err := templates.NewTemplateManager() | ||
if err != nil { | ||
return err | ||
} | ||
|
||
valueColor := getColor(c.gs.Flags.NoColor || !c.gs.Stdout.IsTTY, color.Bold) | ||
printToStdout(c.gs, fmt.Sprintf( | ||
"Initialized a new k6 test script in %s. You can now execute it by running `%s run %s`.\n", | ||
valueColor.Sprint(target), | ||
c.gs.BinaryName, | ||
target, | ||
)) | ||
tmpl, err := tm.GetTemplate(c.templateType) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
argsStruct := templates.TemplateArgs{ | ||
ScriptName: target, | ||
ProjectID: c.projectID, | ||
} | ||
|
||
if err := templates.ExecuteTemplate(fd, tmpl, argsStruct); err != nil { | ||
return err | ||
} | ||
|
||
if _, err := fmt.Fprintf(c.gs.Stdout, "New script created: %s (%s template).\n", target, c.templateType); err != nil { | ||
return err | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func getCmdNewScript(gs *state.GlobalState) *cobra.Command { | ||
c := &newScriptCmd{gs: gs} | ||
|
||
exampleText := getExampleText(gs, ` | ||
# Create a minimal k6 script in the current directory. By default, k6 creates script.js. | ||
{{.}} new | ||
exampleText := getExampleText(c.gs, ` | ||
# Create a minimal k6 script | ||
dgzlopes marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
$ {{.}} new --template minimal | ||
|
||
# Create a minimal k6 script in the current directory and store it in test.js | ||
{{.}} new test.js | ||
# Overwrite an existing file with a protocol-based script | ||
$ {{.}} new -f --template protocol test.js | ||
|
||
# Overwrite existing test.js with a minimal k6 script | ||
{{.}} new -f test.js`[1:]) | ||
# Create a cloud-ready script with a specific project ID | ||
$ {{.}} new --project-id 12315`[1:]) | ||
|
||
initCmd := &cobra.Command{ | ||
Use: "new", | ||
Use: "new [file]", | ||
Short: "Create and initialize a new k6 script", | ||
Long: `Create and initialize a new k6 script. | ||
|
||
This command will create a minimal k6 script in the current directory and | ||
store it in the file specified by the first argument. If no argument is | ||
provided, the script will be stored in script.js. | ||
Long: `Create and initialize a new k6 script using one of the predefined templates. | ||
|
||
This command will not overwrite existing files.`, | ||
By default, the script will be named script.js unless a different name is specified.`, | ||
Example: exampleText, | ||
Args: cobra.MaximumNArgs(1), | ||
RunE: c.run, | ||
} | ||
initCmd.Flags().AddFlagSet(c.flagSet()) | ||
|
||
initCmd.Flags().AddFlagSet(c.flagSet()) | ||
return initCmd | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
import { browser } from "k6/browser"; | ||
import http from "k6/http"; | ||
import { sleep, check } from 'k6'; | ||
|
||
const BASE_URL = __ENV.BASE_URL || "https://quickpizza.grafana.com"; | ||
|
||
export const options = { | ||
scenarios: { | ||
ui: { | ||
executor: "shared-iterations", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I see in other examples we set duration/vus, should we set some "scope" here as well? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍🏻 Furthermore, my understanding is that in general users tend to run browser tests with 1 VU/1 iteration, at least when they get started. I know it's the default anyway, but as we're all addressing beginners with this command, it could be helpful to remove as much implicit as possible? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Makes sense! I have added VUs/Iterations.
It is needed to be able to run a browser test. You must use scenarios, and scenarios must have an executor. Btw... we do this same thing in lots of other places; maybe it is something we should change? cc @ankur22 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You mean adding the VU/iteration to all the other examples too? The situation with scenarios and browser tests isn't great tbh, and being forced to add an executor. I think we wanted to avoid making a very large options block, and the minimal is: export const options = {
scenarios: {
ui: {
executor: 'shared-iterations',
options: {
browser: {
type: 'chromium',
},
},
},
},
}; Adding iteration and vus adds a couple more lines to it. If the general consensus is that it makes is clearer for new users then it's something to consider. CC @inancgumus There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I like being explicit in this k6 new command’s output and including VUs and iterations as outputted examples. Sure, we can also mention VUs and iterations in k6-docs here and there, but in general (all k6-docs, if that’s what we mean), I don’t believe we should add more clutter to that already crowded browser options block. |
||
options: { | ||
browser: { | ||
type: "chromium", | ||
}, | ||
}, | ||
}, | ||
},{{ if .ProjectID }} | ||
cloud: { | ||
projectID: {{ .ProjectID }}, | ||
name: "{{ .ScriptName }}", | ||
},{{ end }} | ||
}; | ||
|
||
export function setup() { | ||
let res = http.get(BASE_URL); | ||
if (res.status !== 200) { | ||
throw new Error( | ||
`Got unexpected status code ${res.status} when trying to setup. Exiting.` | ||
); | ||
} | ||
} | ||
|
||
export default async function() { | ||
oleiade marked this conversation as resolved.
Show resolved
Hide resolved
|
||
let checkData; | ||
const page = await browser.newPage(); | ||
try { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would adding a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe in this case, if the error is not caught, the iteration will be aborted with an error anyway. But it would make sense indeed, if possible to catch the error in order to maybe explicitly call There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have added catch + fail 👀 Also, another thing we can maybe use in all examples cc @ankur22 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have also changed the |
||
await page.goto(BASE_URL); | ||
checkData = await page.locator("h1").textContent(); | ||
check(page, { | ||
header: checkData === "Looking to break out of your pizza routine?", | ||
}); | ||
await page.locator('//button[. = "Pizza, Please!"]').click(); | ||
await page.waitForTimeout(500); | ||
await page.screenshot({ path: "screenshot.png" }); | ||
checkData = await page.locator("div#recommendations").textContent(); | ||
check(page, { | ||
recommendation: checkData !== "", | ||
}); | ||
} finally { | ||
await page.close(); | ||
} | ||
sleep(1); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import http from 'k6/http'; | ||
import { sleep, check } from 'k6'; | ||
|
||
export const options = { | ||
vus: 10, | ||
duration: '30s',{{ if .ProjectID }} | ||
cloud: { | ||
projectID: {{ .ProjectID }}, | ||
name: "{{ .ScriptName }}", | ||
},{{ end }} | ||
}; | ||
|
||
export default function() { | ||
let res = http.get('https://quickpizza.grafana.com'); | ||
check(res, { "status is 200": (res) => res.status === 200 }); | ||
sleep(1); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
import http from "k6/http"; | ||
import { check, sleep } from "k6"; | ||
|
||
const BASE_URL = __ENV.BASE_URL || 'https://quickpizza.grafana.com'; | ||
|
||
export const options = { | ||
vus: 10, | ||
stages: [ | ||
{ duration: "10s", target: 5 }, | ||
{ duration: "20s", target: 10 }, | ||
{ duration: "1s", target: 0 }, | ||
], | ||
thresholds: { | ||
http_req_failed: ["rate<0.01"], | ||
http_req_duration: ["p(95)<500", "p(99)<1000"], | ||
},{{ if .ProjectID }} | ||
cloud: { | ||
projectID: {{ .ProjectID }}, | ||
name: "{{ .ScriptName }}", | ||
},{{ end }} | ||
}; | ||
|
||
export function setup() { | ||
let res = http.get(BASE_URL); | ||
if (res.status !== 200) { | ||
throw new Error( | ||
`Got unexpected status code ${res.status} when trying to setup. Exiting.` | ||
); | ||
} | ||
} | ||
|
||
export default function() { | ||
let restrictions = { | ||
maxCaloriesPerSlice: 500, | ||
mustBeVegetarian: false, | ||
excludedIngredients: ["pepperoni"], | ||
excludedTools: ["knife"], | ||
maxNumberOfToppings: 6, | ||
minNumberOfToppings: 2 | ||
}; | ||
|
||
let res = http.post(BASE_URL + "/api/pizza", JSON.stringify(restrictions), { | ||
headers: { | ||
'Content-Type': 'application/json', | ||
'Authorization': 'token abcdef0123456789', | ||
}, | ||
}); | ||
|
||
check(res, { "status is 200": (res) => res.status === 200 }); | ||
console.log(res.json().pizza.name + " (" + res.json().pizza.ingredients.length + " ingredients)"); | ||
sleep(1); | ||
} |
Uh oh!
There was an error while loading. Please reload this page.