rename trafficgen -> workspace-traffic

johnstcn · johnstcn · commit 7b98b354dccf · 2023-05-04T15:19:15.000+01:00
diff --git a/cli/scaletest.go b/cli/scaletest.go
@@ -27,8 +27,8 @@ import (
 	"github.com/coder/coder/scaletest/createworkspaces"
 	"github.com/coder/coder/scaletest/harness"
 	"github.com/coder/coder/scaletest/reconnectingpty"
-	"github.com/coder/coder/scaletest/trafficgen"
 	"github.com/coder/coder/scaletest/workspacebuild"
+	"github.com/coder/coder/scaletest/workspacetraffic"
 )
 
 const scaletestTracerName = "coder_scaletest"
@@ -43,7 +43,7 @@ func (r *RootCmd) scaletest() *clibase.Cmd {
 		Children: []*clibase.Cmd{
 			r.scaletestCleanup(),
 			r.scaletestCreateWorkspaces(),
-			r.scaletestTrafficGen(),
+			r.scaletestWorkspaceTraffic(),
 		},
 	}
 
@@ -894,7 +894,7 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
 	return cmd
 }
 
-func (r *RootCmd) scaletestTrafficGen() *clibase.Cmd {
+func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
 	var (
 		duration        time.Duration
 		tickInterval    time.Duration
@@ -907,9 +907,8 @@ func (r *RootCmd) scaletestTrafficGen() *clibase.Cmd {
 	)
 
 	cmd := &clibase.Cmd{
-		Use:    "trafficgen",
-		Hidden: true,
-		Short:  "Generate traffic to scaletest workspaces",
+		Use:   "workspace-traffic",
+		Short: "Generate traffic to scaletest workspaces through coderd",
 		Middleware: clibase.Chain(
 			r.InitClient(client),
 		),
@@ -958,7 +957,7 @@ func (r *RootCmd) scaletestTrafficGen() *clibase.Cmd {
 			for idx, ws := range workspaces {
 				var (
 					agentID uuid.UUID
-					name    = "trafficgen"
+					name    = "workspace-traffic"
 					id      = strconv.Itoa(idx)
 				)
 
@@ -975,7 +974,7 @@ func (r *RootCmd) scaletestTrafficGen() *clibase.Cmd {
 				}
 
 				// Setup our workspace agent connection.
-				config := trafficgen.Config{
+				config := workspacetraffic.Config{
 					AgentID:      agentID,
 					BytesPerTick: bytesPerTick,
 					Duration:     duration,
@@ -985,7 +984,7 @@ func (r *RootCmd) scaletestTrafficGen() *clibase.Cmd {
 				if err := config.Validate(); err != nil {
 					return xerrors.Errorf("validate config: %w", err)
 				}
-				var runner harness.Runnable = trafficgen.NewRunner(client, config)
+				var runner harness.Runnable = workspacetraffic.NewRunner(client, config)
 				if tracingEnabled {
 					runner = &runnableTraceWrapper{
 						tracer:   tracer,
@@ -1024,21 +1023,21 @@ func (r *RootCmd) scaletestTrafficGen() *clibase.Cmd {
 	cmd.Options = []clibase.Option{
 		{
 			Flag:        "duration",
-			Env:         "CODER_SCALETEST_TRAFFICGEN_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_TRAFFICGEN_BYTES_PER_TICK",
+			Env:         "CODER_SCALETEST_WORKSPACE_TRAFFIC_BYTES_PER_TICK",
 			Default:     "1024",
 			Description: "How much traffic to generate per tick.",
 			Value:       clibase.Int64Of(&bytesPerTick),
 		},
 		{
 			Flag:        "tick-interval",
-			Env:         "CODER_SCALETEST_TRAFFICGEN_TICK_INTERVAL",
+			Env:         "CODER_SCALETEST_WORKSPACE_TRAFFIC_TICK_INTERVAL",
 			Default:     "100ms",
 			Description: "How often to send traffic.",
 			Value:       clibase.DurationOf(&tickInterval),
diff --git a/cli/scaletest_test.go b/cli/scaletest_test.go
@@ -208,7 +208,7 @@ param3: 1
 // This test pretends to stand up a workspace and run a no-op traffic generation test.
 // It's not a real test, but it's useful for debugging.
 // We do not perform any cleanup.
-func TestScaleTestTrafficGen(t *testing.T) {
+func TestScaleTestWorkspaceTraffic(t *testing.T) {
 	t.Parallel()
 
 	ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitMedium)
@@ -259,7 +259,7 @@ func TestScaleTestTrafficGen(t *testing.T) {
 
 	coderdtest.AwaitWorkspaceAgents(t, client, ws.ID)
 
-	inv, root := clitest.New(t, "scaletest", "trafficgen", ws.Name,
+	inv, root := clitest.New(t, "scaletest", "workspace-traffic",
 		"--duration", "1s",
 		"--bytes-per-tick", "1024",
 		"--tick-interval", "100ms",
diff --git a/scaletest/workspacetraffic/config.go b/scaletest/workspacetraffic/config.go
@@ -1,4 +1,4 @@
-package trafficgen
+package workspacetraffic
 
 import (
 	"time"
diff --git a/scaletest/workspacetraffic/run.go b/scaletest/workspacetraffic/run.go
@@ -1,4 +1,4 @@
-package trafficgen
+package workspacetraffic
 
 import (
 	"context"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package trafficgen`
	`1`	`+package workspacetraffic`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"time"`