Fix linting errors

Signed-off-by: Aram Price <aram.price@broadcom.com>
Co-authored-by: Aram Price <aram.price@broadcom.com>

Author: mariash

handler/common_event_format.go

@@ -52,7 +52,7 @@ func (cef concreteCommonEventFormat) ProduceHTTPRequestEventLog(request *http.Re
 		var buffer bytes.Buffer
 
 		buffer.WriteString(extension)
-		buffer.WriteString(fmt.Sprintf("cs4=%s cs4Label=statusReason", respBody))
+		buffer.WriteString(fmt.Sprintf("cs4=%s cs4Label=statusReason", respBody)) //nolint:staticcheck
 		extension = buffer.String()
 	}
 
@@ -73,7 +73,7 @@ func (cef concreteCommonEventFormat) ProduceNATSRequestEventLog(addr string, por
 		var buffer bytes.Buffer
 
 		buffer.WriteString(extension)
-		buffer.WriteString(fmt.Sprintf("cs1=%s cs1Label=statusReason", respBody))
+		buffer.WriteString(fmt.Sprintf("cs1=%s cs1Label=statusReason", respBody)) //nolint:staticcheck
 		extension = buffer.String()
 	}
 

main/agent.go

@@ -12,8 +12,8 @@ import (
 
 	boshapp "github.com/cloudfoundry/bosh-agent/v2/app"
 	"github.com/cloudfoundry/bosh-agent/v2/infrastructure/agentlogger"
-	"github.com/cloudfoundry/bosh-agent/v2/monitaccess"
 	"github.com/cloudfoundry/bosh-agent/v2/platform"
+	"github.com/cloudfoundry/bosh-agent/v2/platform/firewall"
 )
 
 const mainLogTag = "main"
@@ -86,7 +86,7 @@ func main() {
 			compileTarball(cmd, os.Args[2:])
 			return
 		case "enable-monit-access":
-			monitaccess.EnableMonitAccess(logger, cmd, os.Args[2:])
+			firewall.EnableMonitAccess(logger, cmd, os.Args[2:])
 			return
 		}
 	}

monitaccess/monit_access_windows.go

@@ -13,6 +13,22 @@
 // fails in nested container environments due to cgroup filesystem bind-mount issues.
 package firewall
 
+import "fmt"
+
+const (
+	TableName            = "bosh_agent"
+	MonitChainName       = "monit_access"
+	MonitJobsChainName   = "monit_access_jobs"
+	NATSChainName        = "nats_access"
+	MonitPort            = 2822
+	MonitAccessLogPrefix = "bosh-monit-access: "
+)
+
+var (
+	ErrMonitJobsChainNotFound = fmt.Errorf("%s chain not found", MonitJobsChainName)
+	ErrBoshTableNotFound      = fmt.Errorf("%s table not found", TableName)
+)
+
 // Manager handles firewall setup
 //
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate

platform/firewall/firewall.go

@@ -8,13 +8,12 @@
 //
 // This binary serves as a replacement for the complex bash firewall setup logic
 // that was previously in job service scripts.
-package monitaccess
+package firewall
 
 import (
 	"errors"
 	"os"
 
-	"github.com/cloudfoundry/bosh-agent/v2/platform/firewall"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 )
 
@@ -23,24 +22,24 @@ func EnableMonitAccess(logger boshlog.Logger, command string, args []string) {
 
 	// Validate nftables mode: verify if nftables is available
 	if len(args) > 1 && args[0] == "--validate-nftables-present" {
-		mgr, err := firewall.NewNftablesFirewall(logger)
+		mgr, err := NewNftablesFirewall(logger)
 		if err != nil {
 			os.Exit(1)
 		}
-		defer mgr.Cleanup()
+		defer mgr.Cleanup() //nolint:errcheck
 		os.Exit(0)
 	}
 
-	mgr, err := firewall.NewNftablesFirewall(logger)
+	mgr, err := NewNftablesFirewall(logger)
 	if err != nil {
-		if errors.Is(err, firewall.ErrMonitJobsChainNotFound) {
+		if errors.Is(err, ErrMonitJobsChainNotFound) {
 			logger.Info(command, "monit_access_jobs chain not found (old stemcell), skipping")
 			os.Exit(0)
 		}
 		logger.Error(command, "Failed to create firewall manager: %v", err)
 		os.Exit(1)
 	}
-	defer mgr.Cleanup()
+	defer mgr.Cleanup() //nolint:errcheck
 
 	// Setup mode: add firewall rule
 	logger.Info(command, "Setting up monit firewall rule")

monitaccess/monit_access_linux.go platform/firewall/monit_access.gomonitaccess/monit_access_linux.go renamed to platform/firewall/monit_access.go

@@ -19,20 +19,6 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-const (
-	TableName            = "bosh_agent"
-	MonitChainName       = "monit_access"
-	MonitJobsChainName   = "monit_access_jobs"
-	NATSChainName        = "nats_access"
-	MonitPort            = 2822
-	MonitAccessLogPrefix = "bosh-monit-access: "
-)
-
-var (
-	ErrMonitJobsChainNotFound = fmt.Errorf("%s chain not found", MonitJobsChainName)
-	ErrBoshTableNotFound      = fmt.Errorf("%s table not found", TableName)
-)
-
 // NftablesConn abstracts the nftables connection for testing
 //
 //counterfeiter:generate -header ./firewallfakes/linux_build_constraint.txt . NftablesConn

platform/firewall/nftables_firewall.go

@@ -277,10 +277,6 @@ var _ = Describe("NftablesFirewall", func() {
 				err := manager.EnableMonitAccess()
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring("bosh_agent table not found"))
-			})
-
-			It("does not add any rules", func() {
-				_ = manager.EnableMonitAccess()
 				Expect(fakeConn.AddRuleCallCount()).To(Equal(0))
 			})
 		})