diff --git a/Makefile b/Makefile index 1921c790..90c383fb 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,6 @@ CHROMIUM_RESTART_AFTER=10 CHROMIUM_MAX_QUEUE_SIZE=0 CHROMIUM_AUTO_START=false CHROMIUM_START_TIMEOUT=20s -CHROMIUM_INCOGNITO=false CHROMIUM_ALLOW_INSECURE_LOCALHOST=false CHROMIUM_IGNORE_CERTIFICATE_ERRORS=false CHROMIUM_DISABLE_WEB_SECURITY=false @@ -109,7 +108,6 @@ run: ## Start a Gotenberg container --chromium-auto-start=$(CHROMIUM_AUTO_START) \ --chromium-max-queue-size=$(CHROMIUM_MAX_QUEUE_SIZE) \ --chromium-start-timeout=$(CHROMIUM_START_TIMEOUT) \ - --chromium-incognito=$(CHROMIUM_INCOGNITO) \ --chromium-allow-insecure-localhost=$(CHROMIUM_ALLOW_INSECURE_LOCALHOST) \ --chromium-ignore-certificate-errors=$(CHROMIUM_IGNORE_CERTIFICATE_ERRORS) \ --chromium-disable-web-security=$(CHROMIUM_DISABLE_WEB_SECURITY) \ diff --git a/pkg/modules/chromium/browser.go b/pkg/modules/chromium/browser.go index 0350cc27..4f41e832 100644 --- a/pkg/modules/chromium/browser.go +++ b/pkg/modules/chromium/browser.go @@ -31,7 +31,6 @@ type browser interface { type browserArguments struct { // Executor args. binPath string - incognito bool allowInsecureLocalhost bool ignoreCertificateErrors bool disableWebSecurity bool @@ -108,10 +107,6 @@ func (b *chromiumBrowser) Start(logger *zap.Logger) error { chromedp.Flag("disable-component-update", false), ) - if b.arguments.incognito { - opts = append(opts, chromedp.Flag("incognito", b.arguments.incognito)) - } - if b.arguments.allowInsecureLocalhost { // See https://github.com/gotenberg/gotenberg/issues/488. opts = append(opts, chromedp.Flag("allow-insecure-localhost", true)) diff --git a/pkg/modules/chromium/chromium.go b/pkg/modules/chromium/chromium.go index 799b2e66..e5a433d4 100644 --- a/pkg/modules/chromium/chromium.go +++ b/pkg/modules/chromium/chromium.go @@ -364,7 +364,6 @@ func (mod *Chromium) Descriptor() gotenberg.ModuleDescriptor { fs.Int64("chromium-max-queue-size", 0, "Maximum request queue size for Chromium. Set to 0 to disable this feature") fs.Bool("chromium-auto-start", false, "Automatically launch Chromium upon initialization if set to true; otherwise, Chromium will start at the time of the first conversion") fs.Duration("chromium-start-timeout", time.Duration(20)*time.Second, "Maximum duration to wait for Chromium to start or restart") - fs.Bool("chromium-incognito", false, "Start Chromium with incognito mode") fs.Bool("chromium-allow-insecure-localhost", false, "Ignore TLS/SSL errors on localhost") fs.Bool("chromium-ignore-certificate-errors", false, "Ignore the certificate errors") fs.Bool("chromium-disable-web-security", false, "Don't enforce the same-origin policy") @@ -378,6 +377,13 @@ func (mod *Chromium) Descriptor() gotenberg.ModuleDescriptor { fs.Bool("chromium-disable-javascript", false, "Disable JavaScript") fs.Bool("chromium-disable-routes", false, "Disable the routes") + // Deprecated flags. + fs.Bool("chromium-incognito", false, "Start Chromium with incognito mode") + err := fs.MarkDeprecated("chromium-incognito", "this flag is ignored as it provides no benefits") + if err != nil { + panic(err) + } + return fs }(), New: func() gotenberg.Module { return new(Chromium) }, @@ -402,7 +408,6 @@ func (mod *Chromium) Provision(ctx *gotenberg.Context) error { mod.args = browserArguments{ binPath: binPath, - incognito: flags.MustBool("chromium-incognito"), allowInsecureLocalhost: flags.MustBool("chromium-allow-insecure-localhost"), ignoreCertificateErrors: flags.MustBool("chromium-ignore-certificate-errors"), disableWebSecurity: flags.MustBool("chromium-disable-web-security"),