Merge pull request #12 from Jeffrey-Zutt/fix/protection-bypass-for-automation

okkevandereijk · web-flow · commit 9f6ecfd354fb · 2023-09-11T13:17:07.000+02:00
fix: overriding ProtectionBypassForAutomation
diff --git a/internal/config.go b/internal/config.go
@@ -113,20 +113,16 @@ func (c *ProjectConfig) extendConfig(o *ProjectConfig) *ProjectConfig {
 			cfg.GitRepository = c.GitRepository
 		}
 
-		if !c.ProtectionBypassForAutomation {
+		if c.ProtectionBypassForAutomation {
 			cfg.ProtectionBypassForAutomation = c.ProtectionBypassForAutomation
 		}
 
 		if !c.VercelAuthentication.ProtectProduction {
 			cfg.VercelAuthentication.ProtectProduction = c.VercelAuthentication.ProtectProduction
 		}
 
-		if c.PasswordProtection.Password != "" {
-			cfg.PasswordProtection.Password = c.PasswordProtection.Password
-		}
-
-		if !c.PasswordProtection.ProtectProduction {
-			cfg.PasswordProtection.ProtectProduction = c.PasswordProtection.ProtectProduction
+		if c.PasswordProtection.Password != "" || !c.PasswordProtection.ProtectProduction {
+			cfg.PasswordProtection = c.PasswordProtection
 		}
 
 		if !slices.EqualFunc(c.EnvironmentVariables, o.EnvironmentVariables, EqualEnvironmentVariables) {

Original file line number	Diff line number	Diff line change
`@@ -113,20 +113,16 @@ func (c ProjectConfig) extendConfig(o ProjectConfig) *ProjectConfig {`
`113`	`113`	`cfg.GitRepository = c.GitRepository`
`114`	`114`	`}`
`115`	`115`
`116`		`- if !c.ProtectionBypassForAutomation {`
	`116`	`+ if c.ProtectionBypassForAutomation {`
`117`	`117`	`cfg.ProtectionBypassForAutomation = c.ProtectionBypassForAutomation`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`if !c.VercelAuthentication.ProtectProduction {`
`121`	`121`	`cfg.VercelAuthentication.ProtectProduction = c.VercelAuthentication.ProtectProduction`
`122`	`122`	`}`
`123`	`123`
`124`		`- if c.PasswordProtection.Password != "" {`
`125`		`- cfg.PasswordProtection.Password = c.PasswordProtection.Password`
`126`		`- }`
`127`		`-`
`128`		`- if !c.PasswordProtection.ProtectProduction {`
`129`		`- cfg.PasswordProtection.ProtectProduction = c.PasswordProtection.ProtectProduction`
	`124`	`+ if c.PasswordProtection.Password != "" \|\| !c.PasswordProtection.ProtectProduction {`
	`125`	`+ cfg.PasswordProtection = c.PasswordProtection`
`130`	`126`	`}`
`131`	`127`
`132`	`128`	`if !slices.EqualFunc(c.EnvironmentVariables, o.EnvironmentVariables, EqualEnvironmentVariables) {`