assign nil value to strictSSL when only using flags

saucelabs · Aug 15, 2024 · 6a8bf35 · 6a8bf35
1 parent 91b76a4
commit 6a8bf35
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/internal/cmd/run/cypress.go b/internal/cmd/run/cypress.go
@@ -106,6 +106,13 @@ func runCypress(cmd *cobra.Command, isCLIDriven bool) (int, error) {
 	if err := p.ApplyFlags(gFlags.selectedSuite); err != nil {
 		return 1, err
 	}
+
+	// If npm.strictSSL is not explicitly set via the flag and not configured via the config file,
+	// `StrictSSL` should remain unset, which means it should be nil.
+	if !cmd.Flags().Changed("npm.strictSSL") && gFlags.cfgFilePath == "" {
+		p.SetNpmStrictSSL(nil)
+	}
+
 	p.SetDefaults()
 	if !gFlags.noAutoTagging {
 		p.AppendTags(ci.GetTags())

diff --git a/internal/cmd/run/playwright.go b/internal/cmd/run/playwright.go
@@ -111,6 +111,12 @@ func runPlaywright(cmd *cobra.Command, isCLIDriven bool) (int, error) {
 
 	p.CLIFlags = flags.CaptureCommandLineFlags(cmd.Flags())
 
+	// If npm.strictSSL is not explicitly set via the flag and not configured via the config file,
+	// `StrictSSL` should remain unset, which means it should be nil.
+	if !cmd.Flags().Changed("npm.strictSSL") && gFlags.cfgFilePath == "" {
+		p.Npm.StrictSSL = nil
+	}
+
 	if err := applyPlaywrightFlags(&p); err != nil {
 		return 1, err
 	}

diff --git a/internal/cmd/run/testcafe.go b/internal/cmd/run/testcafe.go
@@ -142,6 +142,12 @@ func runTestcafe(cmd *cobra.Command, tcFlags testcafeFlags, isCLIDriven bool) (i
 
 	p.CLIFlags = flags.CaptureCommandLineFlags(cmd.Flags())
 
+	// If npm.strictSSL is not explicitly set via the flag and not configured via the config file,
+	// `StrictSSL` should remain unset, which means it should be nil.
+	if !cmd.Flags().Changed("npm.strictSSL") && gFlags.cfgFilePath == "" {
+		p.Npm.StrictSSL = nil
+	}
+
 	if err := applyTestcafeFlags(&p, tcFlags); err != nil {
 		return 1, err
 	}

diff --git a/internal/cypress/config.go b/internal/cypress/config.go
@@ -40,6 +40,7 @@ type Project interface {
 	GetReporters() config.Reporters
 	GetNotifications() config.Notifications
 	GetNpm() config.Npm
+	SetNpmStrictSSL(strictSSL *bool)
 	SetCLIFlags(map[string]interface{})
 	GetSuites() []suite.Suite
 	GetKind() string

diff --git a/internal/cypress/v1/config.go b/internal/cypress/v1/config.go
@@ -447,6 +447,10 @@ func (p *Project) GetNpm() config.Npm {
 	return p.Npm
 }
 
+func (p *Project) SetNpmStrictSSL(strictSSL *bool) {
+	p.Npm.StrictSSL = strictSSL
+}
+
 // SetCLIFlags sets cli flags
 func (p *Project) SetCLIFlags(flags map[string]interface{}) {
 	p.CLIFlags = flags