From 78a7dedbadc51d841ec6dce35b2bc3b912e86446 Mon Sep 17 00:00:00 2001
From: z1cheng <imchench@gmail.com>
Date: Sun, 25 Jun 2023 08:14:06 +0000
Subject: [PATCH] Fix gofmt errors

Signed-off-by: z1cheng <imchench@gmail.com>
---
 cmd/dataplane/main.go                        | 4 ++--
 internal/ingress/controller/config/config.go | 2 +-
 internal/ingress/controller/nginx.go         | 2 +-
 test/e2e/framework/httpexpect/chain.go       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/dataplane/main.go b/cmd/dataplane/main.go
index 8d7324bef..a1c4cbcc6 100644
--- a/cmd/dataplane/main.go
+++ b/cmd/dataplane/main.go
@@ -18,10 +18,10 @@ package main
 
 import (
 	"fmt"
-	"net/http"
-	"os"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
+	"net/http"
+	"os"
 
 	"k8s.io/klog/v2"
 
diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go
index ec44b08ed..6c6acf516 100644
--- a/internal/ingress/controller/config/config.go
+++ b/internal/ingress/controller/config/config.go
@@ -91,7 +91,7 @@ const (
 
 // Configuration represents the content of nginx.conf file
 type Configuration struct {
-	defaults.Backend `json:",squash"`
+	defaults.Backend
 
 	// AllowSnippetAnnotations enable users to add their own snippets via ingress annotation.
 	// If disabled, only snippets added via ConfigMap are added to ingress.
diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go
index a7752f93a..4a5a07625 100644
--- a/internal/ingress/controller/nginx.go
+++ b/internal/ingress/controller/nginx.go
@@ -248,7 +248,7 @@ type NGINXController struct {
 
 	store store.Storer
 
-	metricCollector    metric.Collector
+	metricCollector metric.Collector
 
 	validationWebhookServer *http.Server
 
diff --git a/test/e2e/framework/httpexpect/chain.go b/test/e2e/framework/httpexpect/chain.go
index 62152369f..33c4d15b7 100644
--- a/test/e2e/framework/httpexpect/chain.go
+++ b/test/e2e/framework/httpexpect/chain.go
@@ -35,4 +35,4 @@ func (c *chain) fail(message string, args ...interface{}) {
 	}
 	c.failbit = true
 	c.reporter.Errorf(message, args...)
-}
\ No newline at end of file
+}