use strategy.timeout instead of duration

johnstcn · johnstcn · commit 2574a0044fdb · 2023-05-04T15:27:29.000+01:00
diff --git a/cli/scaletest.go b/cli/scaletest.go
@@ -896,7 +896,6 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
 
 func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
 	var (
-		duration        time.Duration
 		tickInterval    time.Duration
 		bytesPerTick    int64
 		client          = &codersdk.Client{}
@@ -977,7 +976,7 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
 				config := workspacetraffic.Config{
 					AgentID:      agentID,
 					BytesPerTick: bytesPerTick,
-					Duration:     duration,
+					Duration:     strategy.timeout,
 					TickInterval: tickInterval,
 				}
 
@@ -1021,13 +1020,6 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
 	}
 
 	cmd.Options = []clibase.Option{
-		{
-			Flag:        "duration",
-			Env:         "CODER_SCALETEST_WORKSPACE_TRAFFIC_DURATION",
-			Default:     "10s",
-			Description: "How long to generate traffic for.",
-			Value:       clibase.DurationOf(&duration),
-		},
 		{
 			Flag:        "bytes-per-tick",
 			Env:         "CODER_SCALETEST_WORKSPACE_TRAFFIC_BYTES_PER_TICK",
diff --git a/cli/scaletest_test.go b/cli/scaletest_test.go
@@ -260,7 +260,7 @@ func TestScaleTestWorkspaceTraffic(t *testing.T) {
 	coderdtest.AwaitWorkspaceAgents(t, client, ws.ID)
 
 	inv, root := clitest.New(t, "scaletest", "workspace-traffic",
-		"--duration", "1s",
+		"--timeout", "1s",
 		"--bytes-per-tick", "1024",
 		"--tick-interval", "100ms",
 	)
diff --git a/cli/testdata/coder_scaletest_workspace-traffic_--help.golden b/cli/testdata/coder_scaletest_workspace-traffic_--help.golden
@@ -19,9 +19,6 @@ Generate traffic to scaletest workspaces through coderd
       --concurrency int, $CODER_SCALETEST_CONCURRENCY (default: 1)
           Number of concurrent jobs to run. 0 means unlimited.
 
-      --duration duration, $CODER_SCALETEST_WORKSPACE_TRAFFIC_DURATION (default: 10s)
-          How long to generate traffic for.
-
       --job-timeout duration, $CODER_SCALETEST_JOB_TIMEOUT (default: 5m)
           Timeout per job. Jobs may take longer to complete under higher
           concurrency limits.
diff --git a/docs/cli/scaletest_workspace-traffic.md b/docs/cli/scaletest_workspace-traffic.md
@@ -62,16 +62,6 @@ Timeout for the entire cleanup run. 0 means unlimited.
 
 Number of concurrent jobs to run. 0 means unlimited.
 
-### --duration
-
-|             |                                                          |
-| ----------- | -------------------------------------------------------- |
-| Type        | <code>duration</code>                                    |
-| Environment | <code>$CODER_SCALETEST_WORKSPACE_TRAFFIC_DURATION</code> |
-| Default     | <code>10s</code>                                         |
-
-How long to generate traffic for.
-
 ### --job-timeout
 
 |             |                                           |

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ func TestScaleTestWorkspaceTraffic(t *testing.T) {`
`260`	`260`	`coderdtest.AwaitWorkspaceAgents(t, client, ws.ID)`
`261`	`261`
`262`	`262`	`inv, root := clitest.New(t, "scaletest", "workspace-traffic",`
`263`		`- "--duration", "1s",`
	`263`	`+ "--timeout", "1s",`
`264`	`264`	`"--bytes-per-tick", "1024",`
`265`	`265`	`"--tick-interval", "100ms",`
`266`	`266`	`)`