fix: fix linter errors

AbsaOSS · Nov 5, 2024 · cf857d8 · cf857d8
1 parent eb25341
commit cf857d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/internal/infoblox/common.go b/internal/infoblox/common.go
@@ -103,7 +103,7 @@ func ToHostResponseMap(res []ibclient.HostRecord) *ResponseMap {
 
 func ToPTRResponseMap(res []ibclient.RecordPTR) *ResponseMap {
 	rm := &ResponseMap{
-		Map:	make(map[string]ResponseDetails),
+		Map:        make(map[string]ResponseDetails),
 		RecordType: ibclient.PtrRecord,
 	}
 	for _, record := range res {
@@ -134,4 +134,3 @@ func (rm *ResponseMap) ToEndpoints() []*endpoint.Endpoint {
 	}
 	return endpoints
 }
-
diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -90,7 +90,11 @@ func (p *Webhook) headerCheck(isContentType bool, w http.ResponseWriter, r *http
 		} else {
 			msg += "an accept header"
 		}
+<<<<<<< HEAD
 		err := errors.New(msg)
+=======
+		err := fmt.Errorf("%s", msg)
+>>>>>>> 61d5f4c (fix: fix linter errors)
 
 		_, writeErr := fmt.Fprint(w, err.Error())
 		if writeErr != nil {