Skip to content
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.

Sign up for GitHub

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

Move cloud run and login functionalities under cloud subcommands #3813

Merged
merged 11 commits into from
Jul 24, 2024
Merged

Move cloud run and login functionalities under cloud subcommands #3813

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3bb9797
Introduce a `k6 cloud run` command
oleiade Jun 25, 2024
c487a70
Introduce a `k6 cloud login` command
oleiade Jun 25, 2024
42f9de4
Register run and login subcommands of the cloud command
oleiade Jun 25, 2024
51427e1
Add deprecation warning to k6 login and k6 login cloud commands
oleiade Jun 25, 2024
4063228
FIXME add tests assert k6 cloud run command's arguments handling
oleiade Jun 25, 2024
231f50e
Apply Pull-Request suggestions
oleiade Jul 17, 2024
972219e
Improve cloud commands missing arguments handling
oleiade Jul 19, 2024
3965239
Apply suggestions from code review
oleiade Jul 19, 2024
2b0bc1f
Refactor cloud run command and tests to leverage existing code
oleiade Jul 23, 2024
fd6daac
Apply suggestions from code review
oleiade Jul 24, 2024
a569c16
fix lint of cmd package
oleiade Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Oleg Bespalov <[email protected]>
  • Loading branch information
@oleiade @olegbespalov
oleiade and olegbespalov authored Jul 24, 2024
commit fd6daac399bb1c665a2be83fa8432ef1cce1a0b6
6 changes: 3 additions & 3 deletions cmd/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (c *cmdCloud) run(cmd *cobra.Command, args []string) error {
}
if !cloudConfig.Token.Valid {
return errors.New( //nolint:golint
"not logged in, please login to the Grafana Cloud k6 " +
"not logged in, please login first to the Grafana Cloud k6 " +
"using the \"k6 cloud login\" command",
)
}
Expand Down Expand Up @@ -366,9 +366,9 @@ func getCmdCloud(gs *state.GlobalState) *cobra.Command {
cloudCmd := &cobra.Command{
Use: "cloud",
Short: "Run a test on the cloud",
Long: `Run a test archive in the Grafana Cloud k6.
Long: `Run a test in the Grafana Cloud k6.

This will execute the test in the Grafana Cloud k6 service. Be sure to run the "k6 cloud login" command prior to
This will archive test script(s), including all necessary resources, and execute the test in the Grafana Cloud k6 service. Be sure to run the "k6 cloud login" command prior to
authenticate with Grafana Cloud k6.`,
Args: exactCloudArgs(),
Deprecated: `the k6 team is in the process of modifying and deprecating the "k6 cloud" command behavior.
Expand Down
1 change: 1 addition & 0 deletions cmd/cloud_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ func (c *cmdCloudLogin) run(cmd *cobra.Command, _ []string) error {
newCloudConf.Token = token
default:
form := ui.Form{
Banner: "Please enter your Grafana Cloud k6 credentials",
Fields: []ui.Field{
ui.StringField{
Key: "Email",
Expand Down
2 changes: 1 addition & 1 deletion cmd/cloud_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func getCmdCloudRun(gs *state.GlobalState) *cobra.Command {
Short: "Run a test in Grafana Cloud k6",
Long: `Run a test in Grafana Cloud k6.

This will execute the test in the Grafana Cloud k6 service. Using this command requires to be authenticated
This will archive test script(s), including all necessary resources, and execute the test in the Grafana Cloud k6 service. Using this command requires to be authenticated
against Grafana Cloud k6. Use the "k6 cloud login" command to authenticate.`,
Example: exampleText,
Args: exactArgsWithMsg(1,
Expand Down
Loading