From 1ff9fda8cb83a1e7d652bd856828135352ee932e Mon Sep 17 00:00:00 2001
From: Denis Mishin <dmishin@pomerium.com>
Date: Tue, 25 Oct 2022 12:30:41 -0400
Subject: [PATCH] fix linter complaints (#409)

---
 Makefile                             | 1 +
 apis/ingress/v1/groupversion_info.go | 4 ++--
 apis/ingress/v1/pomerium_types.go    | 2 +-
 controllers/config_controller.go     | 2 +-
 controllers/deps/deps.go             | 2 +-
 controllers/mock/mock.go             | 2 +-
 controllers/settings/fetch.go        | 2 +-
 go.mod                               | 2 +-
 internal/init.go                     | 2 +-
 main.go                              | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 702502c5..1a5266a6 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,7 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and
 	@echo "==> $@"
 	@$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths=$(CRD_PACKAGE)
 	@go generate $(GOTAGS) ./...
+	@gofmt -s -w ./
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
diff --git a/apis/ingress/v1/groupversion_info.go b/apis/ingress/v1/groupversion_info.go
index f32d5339..0f6d39ba 100644
--- a/apis/ingress/v1/groupversion_info.go
+++ b/apis/ingress/v1/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1 contains API Schema definitions for the ingress v1 API group
-//+kubebuilder:object:generate=true
-//+groupName=ingress.pomerium.io
+// +kubebuilder:object:generate=true
+// +groupName=ingress.pomerium.io
 package v1
 
 import (
diff --git a/apis/ingress/v1/pomerium_types.go b/apis/ingress/v1/pomerium_types.go
index 17e7d71f..957dc354 100644
--- a/apis/ingress/v1/pomerium_types.go
+++ b/apis/ingress/v1/pomerium_types.go
@@ -134,7 +134,7 @@ type PostgresStorage struct {
 // Storage defines persistent storage option for the databroker
 // and is only applied for all-in-one pomerium bootstrap,
 // and has no effect for the split-mode deployment.
-// If Storage is specified, either `redis`` or `postgresql` parameter should be set.
+// If Storage is specified, either `redis` or `postgresql` parameter should be set.
 // Omit setting storage to use in-memory storage implementation.
 type Storage struct {
 	// Redis defines REDIS connection parameters
diff --git a/controllers/config_controller.go b/controllers/config_controller.go
index 83b0f0c8..63d20556 100644
--- a/controllers/config_controller.go
+++ b/controllers/config_controller.go
@@ -1,4 +1,4 @@
-//Package controllers contains k8s reconciliation controllers
+// Package controllers contains k8s reconciliation controllers
 package controllers
 
 import (
diff --git a/controllers/deps/deps.go b/controllers/deps/deps.go
index 658febae..8ebe906b 100644
--- a/controllers/deps/deps.go
+++ b/controllers/deps/deps.go
@@ -1,4 +1,4 @@
-//Package deps implements dependencies management
+// Package deps implements dependencies management
 package deps
 
 import (
diff --git a/controllers/mock/mock.go b/controllers/mock/mock.go
index 9bb71ea3..20a23252 100644
--- a/controllers/mock/mock.go
+++ b/controllers/mock/mock.go
@@ -1,4 +1,4 @@
-//Package mock_test contains mock clients for testing
+// Package mock_test contains mock clients for testing
 package mock_test
 
 //go:generate go run github.com/golang/mock/mockgen -package mock_test -destination client.go sigs.k8s.io/controller-runtime/pkg/client Client
diff --git a/controllers/settings/fetch.go b/controllers/settings/fetch.go
index 09c76c94..3da290ba 100644
--- a/controllers/settings/fetch.go
+++ b/controllers/settings/fetch.go
@@ -1,4 +1,4 @@
-//Package settings implements controller for Settings CRD
+// Package settings implements controller for Settings CRD
 package settings
 
 import (
diff --git a/go.mod b/go.mod
index ea554660..057b73e3 100644
--- a/go.mod
+++ b/go.mod
@@ -17,6 +17,7 @@ require (
 	github.com/iancoleman/strcase v0.2.0
 	github.com/martinlindhe/base36 v1.1.1
 	github.com/open-policy-agent/opa v0.45.0
+	github.com/pomerium/csrf v1.7.0
 	github.com/pomerium/pomerium v0.19.1
 	github.com/sergi/go-diff v1.2.0
 	github.com/spf13/cobra v1.6.0
@@ -228,7 +229,6 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polyfloyd/go-errorlint v1.0.5 // indirect
-	github.com/pomerium/csrf v1.7.0 // indirect
 	github.com/pomerium/webauthn v0.0.0-20211014213840-422c7ce1077f // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_golang v1.13.0 // indirect
diff --git a/internal/init.go b/internal/init.go
index d102537b..2124a766 100644
--- a/internal/init.go
+++ b/internal/init.go
@@ -1,2 +1,2 @@
-//Package internal implements few hacks to allow pomerium embeddeding
+// Package internal implements few hacks to allow pomerium embeddeding
 package internal
diff --git a/main.go b/main.go
index 93124880..af62d8c5 100644
--- a/main.go
+++ b/main.go
@@ -1,4 +1,4 @@
-//Package main contains main app entry point
+// Package main contains main app entry point
 package main
 
 import (