feat: remove deprecated stuff (#726)

pkg/modules/chromium/chromium.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/alexliesenfeld/health"
 	flag "github.com/spf13/pflag"
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 
 	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
@@ -217,18 +216,6 @@ func (mod *Chromium) Descriptor() gotenberg.ModuleDescriptor {
 		ID: "chromium",
 		FlagSet: func() *flag.FlagSet {
 			fs := flag.NewFlagSet("chromium", flag.ExitOnError)
-			// Deprecated flags.
-			fs.String("chromium-user-agent", "", "Override the default User-Agent header")
-			fs.Int("chromium-failed-starts-threshold", 5, "Set the number of consecutive failed starts after which the module is considered unhealthy - 0 means ignore")
-
-			var err error
-			err = multierr.Append(err, fs.MarkDeprecated("chromium-user-agent", "use the extraHttpHeaders form field instead"))
-			err = multierr.Append(err, fs.MarkDeprecated("chromium-failed-starts-threshold", "use the chromium-restart-after property instead"))
-
-			if err != nil {
-				panic(fmt.Errorf("create deprecated flags for the Chromium module: %v", err))
-			}
-
 			fs.Int64("chromium-restart-after", 0, "Number of conversions after which Chromium will automatically restart. 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(10)*time.Second, "Maximum duration to wait for Chromium to start or restart")
@@ -359,22 +346,6 @@ func (mod *Chromium) Stop(ctx context.Context) error {
 // Metrics returns the metrics.
 func (mod *Chromium) Metrics() ([]gotenberg.Metric, error) {
 	return []gotenberg.Metric{
-		{
-			// TODO: remove deprecated.
-			Name:        "chromium_active_instances_count",
-			Description: "Current number of active Chromium instances - deprecated.",
-			Read: func() float64 {
-				return 1
-			},
-		},
-		{
-			// TODO: remove deprecated.
-			Name:        "chromium_failed_starts_count",
-			Description: "Current number of Chromium consecutive starting failures - deprecated.",
-			Read: func() float64 {
-				return 0
-			},
-		},
 		{
 			Name:        "chromium_requests_queue_size",
 			Description: "Current number of Chromium conversion requests waiting to be treated.",

pkg/modules/chromium/chromium_test.go

@@ -334,26 +334,16 @@ func TestChromium_Metrics(t *testing.T) {
 		t.Fatalf("expected no error but got: %v", err)
 	}
 
-	if len(metrics) != 4 {
-		t.Fatalf("expected %d metrics, but got %d", 4, len(metrics))
+	if len(metrics) != 2 {
+		t.Fatalf("expected %d metrics, but got %d", 2, len(metrics))
 	}
 
 	actual := metrics[0].Read()
-	if actual != float64(1) {
-		t.Errorf("expected %f for chromium_active_instances_count, but got %f", float64(1), actual)
-	}
-
-	actual = metrics[1].Read()
-	if actual != float64(0) {
-		t.Errorf("expected %f for chromium_failed_starts_count, but got %f", float64(0), actual)
-	}
-
-	actual = metrics[2].Read()
 	if actual != float64(10) {
 		t.Errorf("expected %f for chromium_requests_queue_size, but got %f", float64(10), actual)
 	}
 
-	actual = metrics[3].Read()
+	actual = metrics[1].Read()
 	if actual != float64(0) {
 		t.Errorf("expected %f for chromium_restarts_count, but got %f", float64(0), actual)
 	}

pkg/modules/chromium/routes.go

@@ -31,7 +31,6 @@ func FormDataChromiumPdfOptions(ctx *api.Context) (*api.FormData, Options) {
 		waitDelay                                        time.Duration
 		waitWindowStatus                                 string
 		waitForExpression                                string
-		userAgent                                        string
 		extraHttpHeaders                                 map[string]string
 		emulatedMediaType                                string
 		landscape, printBackground, omitBackground       bool
@@ -47,7 +46,6 @@ func FormDataChromiumPdfOptions(ctx *api.Context) (*api.FormData, Options) {
 		Duration("waitDelay", &waitDelay, defaultOptions.WaitDelay).
 		String("waitWindowStatus", &waitWindowStatus, defaultOptions.WaitWindowStatus).
 		String("waitForExpression", &waitForExpression, defaultOptions.WaitForExpression).
-		String("userAgent", &userAgent, ""). // FIXME: deprecated.
 		Custom("extraHttpHeaders", func(value string) error {
 			if value == "" {
 				extraHttpHeaders = defaultOptions.ExtraHttpHeaders
@@ -92,17 +90,6 @@ func FormDataChromiumPdfOptions(ctx *api.Context) (*api.FormData, Options) {
 		Content("footer.html", &footerTemplate, defaultOptions.FooterTemplate).
 		Bool("preferCssPageSize", &preferCssPageSize, defaultOptions.PreferCssPageSize)
 
-	// FIXME: deprecated.
-	if userAgent != "" {
-		ctx.Log().Warn("'userAgent' is deprecated; prefer the 'extraHttpHeaders' form field instead")
-
-		if extraHttpHeaders == nil {
-			extraHttpHeaders = make(map[string]string)
-		}
-
-		extraHttpHeaders["User-Agent"] = userAgent
-	}
-
 	options := Options{
 		FailOnConsoleExceptions: failOnConsoleExceptions,
 		WaitDelay:               waitDelay,
@@ -133,31 +120,16 @@ func FormDataChromiumPdfOptions(ctx *api.Context) (*api.FormData, Options) {
 // data. Fallback to default value if the considered key is not present.
 func FormDataChromiumPdfFormats(ctx *api.Context) gotenberg.PdfFormats {
 	var (
-		pdfFormat string
-		pdfa      string
-		pdfua     bool
+		pdfa  string
+		pdfua bool
 	)
 
 	ctx.FormData().
-		String("pdfFormat", &pdfFormat, "").
 		String("pdfa", &pdfa, "").
 		Bool("pdfua", &pdfua, false)
 
-	// FIXME: deprecated.
-	// pdfa > pdfFormat.
-	var actualPdfArchive string
-
-	if pdfFormat != "" {
-		ctx.Log().Warn("'pdfFormat' is deprecated; prefer the 'pdfa' form field instead")
-		actualPdfArchive = pdfFormat
-	}
-
-	if pdfa != "" {
-		actualPdfArchive = pdfa
-	}
-
 	return gotenberg.PdfFormats{
-		PdfA:  actualPdfArchive,
+		PdfA:  pdfa,
 		PdfUa: pdfua,
 	}
 }

pkg/modules/chromium/routes_test.go

@@ -28,25 +28,6 @@ func TestFormDataChromiumPdfOptions(t *testing.T) {
 			ctx:             &api.ContextMock{Context: new(api.Context)},
 			expectedOptions: DefaultOptions(),
 		},
-		{
-			scenario: "deprecated userAgent form field",
-			ctx: func() *api.ContextMock {
-				ctx := &api.ContextMock{Context: new(api.Context)}
-				ctx.SetValues(map[string][]string{
-					"userAgent": {
-						"foo",
-					},
-				})
-				return ctx
-			}(),
-			expectedOptions: func() Options {
-				options := DefaultOptions()
-				options.ExtraHttpHeaders = map[string]string{
-					"User-Agent": "foo",
-				}
-				return options
-			}(),
-		},
 		{
 			scenario: "invalid extraHttpHeaders form field",
 			ctx: func() *api.ContextMock {
@@ -132,19 +113,6 @@ func TestFormDataChromiumPdfFormats(t *testing.T) {
 			ctx:                &api.ContextMock{Context: new(api.Context)},
 			expectedPdfFormats: gotenberg.PdfFormats{},
 		},
-		{
-			scenario: "deprecated pdfFormat form field",
-			ctx: func() *api.ContextMock {
-				ctx := &api.ContextMock{Context: new(api.Context)}
-				ctx.SetValues(map[string][]string{
-					"pdfFormat": {
-						"foo",
-					},
-				})
-				return ctx
-			}(),
-			expectedPdfFormats: gotenberg.PdfFormats{PdfA: "foo"},
-		},
 		{
 			scenario: "pdfa and pdfua form fields",
 			ctx: func() *api.ContextMock {
@@ -726,7 +694,7 @@ func TestConvertUrl(t *testing.T) {
 			expectOutputPathsCount: 0,
 		},
 		{
-			scenario: "success with pdfFormat form field",
+			scenario: "success with pdfa form field",
 			ctx:      &api.ContextMock{Context: new(api.Context)},
 			api: &ApiMock{func(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 				return nil