chore: Update deprecated tunnel configs (#948)

saucelabs · Sep 10, 2024 · f9ecfbd · f9ecfbd
1 parent a6a8bd1
commit f9ecfbd
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/internal/http/rdcservice.go b/internal/http/rdcservice.go
@@ -117,8 +117,8 @@ func (c *RDCService) StartJob(ctx context.Context, opts job.StartOptions) (jobID
 		TestsToSkip:         opts.TestsToSkip,
 		DeviceQuery:         c.deviceQuery(opts),
 		TestFramework:       frameworkName,
-		TunnelName:          opts.Tunnel.ID,
-		TunnelOwner:         opts.Tunnel.Parent,
+		TunnelName:          opts.Tunnel.Name,
+		TunnelOwner:         opts.Tunnel.Owner,
 		UseTestOrchestrator: useTestOrchestrator,
 		Tags:                opts.Tags,
 		Build:               opts.Build,

diff --git a/internal/http/webdriver.go b/internal/http/webdriver.go
@@ -57,8 +57,8 @@ type SauceOpts struct {
 	Batch            Batch    `json:"_batch,omitempty"`
 	IdleTimeout      int      `json:"idleTimeout,omitempty"`
 	MaxDuration      int      `json:"maxDuration,omitempty"`
-	TunnelIdentifier string   `json:"tunnelIdentifier,omitempty"`
-	TunnelParent     string   `json:"parentTunnel,omitempty"` // note that 'parentTunnel` is backwards, because that's the way sauce likes it
+	TunnelName       string   `json:"tunnelName,omitempty"`
+	TunnelOwner      string   `json:"tunnelOwner,omitempty"`
 	ScreenResolution string   `json:"screen_resolution,omitempty"`
 	UserAgent        string   `json:"user_agent,omitempty"`
 	TimeZone         string   `json:"timeZone,omitempty"`
@@ -136,8 +136,8 @@ func (c *Webdriver) StartJob(ctx context.Context, opts job.StartOptions) (jobID
 		PlatformVersion: opts.PlatformVersion,
 		SauceOptions: SauceOpts{
 			UserAgent:        "saucectl/" + version.Version,
-			TunnelIdentifier: opts.Tunnel.ID,
-			TunnelParent:     opts.Tunnel.Parent,
+			TunnelName:       opts.Tunnel.Name,
+			TunnelOwner:      opts.Tunnel.Owner,
 			ScreenResolution: opts.ScreenResolution,
 			TestName:         opts.Name,
 			BuildName:        opts.Build,

diff --git a/internal/job/starter.go b/internal/job/starter.go
@@ -111,8 +111,8 @@ type Instrumentation struct {
 
 // TunnelOptions represents the options that configure the usage of a tunnel when running tests in the Sauce Labs cloud.
 type TunnelOptions struct {
-	ID     string `json:"id"`
-	Parent string `json:"parent,omitempty"`
+	Name  string `json:"name"`
+	Owner string `json:"owner,omitempty"`
 }
 
 // SmartRetry represents the retry strategy.

diff --git a/internal/saucecloud/cloud.go b/internal/saucecloud/cloud.go
@@ -231,7 +231,7 @@ func (r *CloudRunner) runJob(opts job.StartOptions) (j job.Job, skipped bool, er
 	log.Info().
 		Str("suite", opts.DisplayName).
 		Str("region", r.Region.String()).
-		Str("tunnel", opts.Tunnel.ID).
+		Str("tunnel", opts.Tunnel.Name).
 		Msg("Starting suite.")
 
 	id, _, err := r.JobService.StartJob(context.Background(), opts)

diff --git a/internal/saucecloud/cucumber.go b/internal/saucecloud/cucumber.go
@@ -168,8 +168,8 @@ func (r *CucumberRunner) runSuites(app string, otherApps []string) bool {
 				Build:            r.Project.Sauce.Metadata.Build,
 				Tags:             r.Project.Sauce.Metadata.Tags,
 				Tunnel: job.TunnelOptions{
-					ID:     r.Project.Sauce.Tunnel.Name,
-					Parent: r.Project.Sauce.Tunnel.Owner,
+					Name:  r.Project.Sauce.Tunnel.Name,
+					Owner: r.Project.Sauce.Tunnel.Owner,
 				},
 				ScreenResolution: s.ScreenResolution,
 				RunnerVersion:    r.Project.RunnerVersion,

diff --git a/internal/saucecloud/cypress.go b/internal/saucecloud/cypress.go
@@ -162,8 +162,8 @@ func (r *CypressRunner) runSuites(app string, otherApps []string) bool {
 				Build:            r.Project.GetSauceCfg().Metadata.Build,
 				Tags:             r.Project.GetSauceCfg().Metadata.Tags,
 				Tunnel: job.TunnelOptions{
-					ID:     r.Project.GetSauceCfg().Tunnel.Name,
-					Parent: r.Project.GetSauceCfg().Tunnel.Owner,
+					Name:  r.Project.GetSauceCfg().Tunnel.Name,
+					Owner: r.Project.GetSauceCfg().Tunnel.Owner,
 				},
 				ScreenResolution: s.ScreenResolution,
 				RunnerVersion:    r.Project.GetRunnerVersion(),

diff --git a/internal/saucecloud/espresso.go b/internal/saucecloud/espresso.go
@@ -224,8 +224,8 @@ func (r *EspressoRunner) startJob(jobOpts chan<- job.StartOptions, s espresso.Su
 		Build:             r.Project.Sauce.Metadata.Build,
 		Tags:              r.Project.Sauce.Metadata.Tags,
 		Tunnel: job.TunnelOptions{
-			ID:     r.Project.Sauce.Tunnel.Name,
-			Parent: r.Project.Sauce.Tunnel.Owner,
+			Name:  r.Project.Sauce.Tunnel.Name,
+			Owner: r.Project.Sauce.Tunnel.Owner,
 		},
 		Experiments:   r.Project.Sauce.Experiments,
 		TestOptions:   s.TestOptions,

diff --git a/internal/saucecloud/playwright.go b/internal/saucecloud/playwright.go
@@ -178,8 +178,8 @@ func (r *PlaywrightRunner) runSuites(app string, otherApps []string) bool {
 				Build:            r.Project.Sauce.Metadata.Build,
 				Tags:             r.Project.Sauce.Metadata.Tags,
 				Tunnel: job.TunnelOptions{
-					ID:     r.Project.Sauce.Tunnel.Name,
-					Parent: r.Project.Sauce.Tunnel.Owner,
+					Name:  r.Project.Sauce.Tunnel.Name,
+					Owner: r.Project.Sauce.Tunnel.Owner,
 				},
 				ScreenResolution: s.ScreenResolution,
 				RunnerVersion:    r.Project.RunnerVersion,

diff --git a/internal/saucecloud/replay.go b/internal/saucecloud/replay.go
@@ -109,8 +109,8 @@ func (r *ReplayRunner) runSuites(fileURI string) bool {
 				Build:            r.Project.Sauce.Metadata.Build,
 				Tags:             r.Project.Sauce.Metadata.Tags,
 				Tunnel: job.TunnelOptions{
-					ID:     r.Project.Sauce.Tunnel.Name,
-					Parent: r.Project.Sauce.Tunnel.Owner,
+					Name:  r.Project.Sauce.Tunnel.Name,
+					Owner: r.Project.Sauce.Tunnel.Owner,
 				},
 				Experiments:   r.Project.Sauce.Experiments,
 				Attempt:       0,

diff --git a/internal/saucecloud/testcafe.go b/internal/saucecloud/testcafe.go
@@ -196,8 +196,8 @@ func (r *TestcafeRunner) generateStartOpts(s testcafe.Suite) job.StartOptions {
 		Build:            r.Project.Sauce.Metadata.Build,
 		Tags:             r.Project.Sauce.Metadata.Tags,
 		Tunnel: job.TunnelOptions{
-			ID:     r.Project.Sauce.Tunnel.Name,
-			Parent: r.Project.Sauce.Tunnel.Owner,
+			Name:  r.Project.Sauce.Tunnel.Name,
+			Owner: r.Project.Sauce.Tunnel.Owner,
 		},
 		ScreenResolution: s.ScreenResolution,
 		RunnerVersion:    r.Project.RunnerVersion,

diff --git a/internal/saucecloud/xcuitest.go b/internal/saucecloud/xcuitest.go
@@ -217,8 +217,8 @@ func (r *XcuitestRunner) startJob(jobOpts chan<- job.StartOptions, appFileID, te
 		Build:            r.Project.Sauce.Metadata.Build,
 		Tags:             r.Project.Sauce.Metadata.Tags,
 		Tunnel: job.TunnelOptions{
-			ID:     r.Project.Sauce.Tunnel.Name,
-			Parent: r.Project.Sauce.Tunnel.Owner,
+			Name:  r.Project.Sauce.Tunnel.Name,
+			Owner: r.Project.Sauce.Tunnel.Owner,
 		},
 		Experiments:   r.Project.Sauce.Experiments,
 		TestsToRun:    s.TestOptions.Class,