chore: enable gofumpt lint (#204)

netboxlabs · Dec 16, 2024 · 6ea3df5 · 6ea3df5
1 parent a8b8ef7
commit 6ea3df5
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 11 deletions.
diff --git a/.github/golangci.yaml b/.github/golangci.yaml
@@ -16,6 +16,7 @@ linters:
     - gosimple
     - bodyclose
     - gci
+    - gofumpt
 
 issues:
   exclude-use-default: false
@@ -35,3 +36,5 @@ linters-settings:
       - default
       - prefix(github.com/netboxlabs/diode)
     custom-order: true
+  go-fumpt:
+    extra-rules: true
diff --git a/diode-server/Makefile b/diode-server/Makefile
@@ -36,6 +36,10 @@ deps:
 lint:
 	@golangci-lint run ./... --config ../.github/golangci.yaml
 
+.PHONY: fix-lint
+fix-lint:
+	@golangci-lint run ./... --config ../.github/golangci.yaml --fix
+
 .PHONY: test
 test:
 	@go test -race ./...

diff --git a/diode-server/cmd/ingester/main.go b/diode-server/cmd/ingester/main.go
@@ -27,7 +27,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	//TODO: instantiate prometheus server
+	// TODO: instantiate prometheus server
 
 	if err := s.Run(); err != nil {
 		s.Logger().Error("server failure", "serverName", s.Name(), "error", err)

diff --git a/diode-server/cmd/reconciler/main.go b/diode-server/cmd/reconciler/main.go
@@ -66,7 +66,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	//TODO: instantiate prometheus server
+	// TODO: instantiate prometheus server
 
 	if err := s.Run(); err != nil {
 		s.Logger().Error("server failure", "serverName", s.Name(), "error", err)

diff --git a/diode-server/netboxdiodeplugin/client.go b/diode-server/netboxdiodeplugin/client.go
@@ -373,8 +373,8 @@ func statusMapToStringHookFunc() mapstructure.DecodeHookFunc {
 	return func(
 		f reflect.Kind,
 		t reflect.Kind,
-		data interface{}) (interface{}, error) {
-
+		data interface{},
+	) (interface{}, error) {
 		if f != reflect.Map {
 			return data, nil
 		}

diff --git a/diode-server/netboxdiodeplugin/client_test.go b/diode-server/netboxdiodeplugin/client_test.go
@@ -478,7 +478,8 @@ func TestRetrieveObjectState(t *testing.T) {
 			params: netboxdiodeplugin.RetrieveObjectStateQueryParams{
 				ObjectType: netbox.DcimDeviceObjectType,
 				ObjectID:   1,
-				Params:     map[string]string{"q": "dev1", "attr_name": "site.id", "attr_value": "2"}},
+				Params:     map[string]string{"q": "dev1", "attr_name": "site.id", "attr_value": "2"},
+			},
 			mockServerResponse: `{"object_type":"dcim.device","object_change_id":1,"object":{"id":1,"name":"dev1", "site": {"id": 2}}}`,
 			apiKey:             "foobar",
 			response: &netboxdiodeplugin.ObjectState{

diff --git a/diode-server/reconciler/differ/differ_virt_test.go b/diode-server/reconciler/differ/differ_virt_test.go
@@ -743,7 +743,6 @@ func TestVirtualizationPrepare(t *testing.T) {
 			wantChangeSet: changeset.ChangeSet{
 				ChangeSetID: "5663a77e-9bad-4981-afe9-77d8a9f2b8b5",
 				ChangeSet: []changeset.Change{
-
 					{
 						ChangeID:      "5663a77e-9bad-4981-afe9-77d8a9f2b8b5",
 						ChangeType:    changeset.ChangeTypeCreate,

diff --git a/diode-server/reconciler/ingestion_processor.go b/diode-server/reconciler/ingestion_processor.go
@@ -481,7 +481,7 @@ func (p *IngestionProcessor) writeIngestionLog(ctx context.Context, key string,
 }
 
 func normalizeIngestionLog(l []byte) []byte {
-	//replace ingestionTs string value as integer, see: https://github.com/golang/protobuf/issues/1414
+	// replace ingestionTs string value as integer, see: https://github.com/golang/protobuf/issues/1414
 	re := regexp.MustCompile(`"ingestionTs":"(\d+)"`)
 	return re.ReplaceAll(l, []byte(`"ingestionTs":$1`))
 }

diff --git a/diode-server/reconciler/ingestion_processor_internal_test.go b/diode-server/reconciler/ingestion_processor_internal_test.go
@@ -276,12 +276,14 @@ func TestHandleStreamMessage(t *testing.T) {
 			if tt.reconcilerError {
 				mockNbClient.On("RetrieveObjectState", ctx, mock.Anything).Return(&netboxdiodeplugin.ObjectState{}, errors.New("prepare error"))
 			} else {
-				mockNbClient.On("RetrieveObjectState", ctx, mock.Anything).Return(&netboxdiodeplugin.ObjectState{ObjectType: "dcim.site",
+				mockNbClient.On("RetrieveObjectState", ctx, mock.Anything).Return(&netboxdiodeplugin.ObjectState{
+					ObjectType:     "dcim.site",
 					ObjectID:       0,
 					ObjectChangeID: 0,
 					Object: &netbox.DcimSiteDataWrapper{
 						Site: nil,
-					}}, nil)
+					},
+				}, nil)
 			}
 			mockNbClient.On("ApplyChangeSet", ctx, mock.Anything).Return(tt.changeSetResponse, tt.changeSetError)
 			if tt.entities[0].Entity != nil {

diff --git a/diode-server/reconciler/logs_retriever.go b/diode-server/reconciler/logs_retriever.go
@@ -262,8 +262,8 @@ func buildQueryFilter(req *reconcilerpb.RetrieveIngestionLogsRequest) string {
 }
 
 func escapeSpecialChars(s string) string {
-	//replace ,.<>{}[]"':;!@#$%^&*()-+=~ with double backslash
-	//ref: https://redis.io/docs/latest/develop/interact/search-and-query/advanced-concepts/escaping/
+	// replace ,.<>{}[]"':;!@#$%^&*()-+=~ with double backslash
+	// ref: https://redis.io/docs/latest/develop/interact/search-and-query/advanced-concepts/escaping/
 	oldNew := []string{
 		",", "\\,", ".", "\\.", "<", "\\<", ">", "\\>", "{", "\\{", "}", "\\}", "[", "\\[", "]", "\\]", "\"", "\\\"",
 		"'", "\\'", ":", "\\:", ";", "\\;", "!", "\\!", "@", "\\@", "#", "\\#", "$", "\\$", "%", "\\%", "^", "\\^",