chore: fix a few linter warnings

godot, misspell, staticcheck. Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
siderolabs · May 18, 2021 · 2e8c1ed · 2e8c1ed
1 parent 6bcf9a8
commit 2e8c1ed
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -124,15 +124,12 @@ linters:
     - forcetypeassert
     - gci
     - gocyclo
-    - godot
     - golint
     - govet
     - lll
-    - misspell
     - nlreturn
     - predeclared
     - revive
-    - staticcheck
     - stylecheck
 
     - gas

diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/groupversion_info.go b/app/cluster-api-provider-sidero/api/v1alpha2/groupversion_info.go
@@ -13,10 +13,10 @@ import (
 )
 
 var (
-	// GroupVersion is group version used to register these objects
+	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha2"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.

diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/groupversion_info.go b/app/cluster-api-provider-sidero/api/v1alpha3/groupversion_info.go
@@ -13,10 +13,10 @@ import (
 )
 
 var (
-	// GroupVersion is group version used to register these objects
+	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha3"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.

diff --git a/app/cluster-api-provider-sidero/controllers/suite_test.go b/app/cluster-api-provider-sidero/controllers/suite_test.go
@@ -43,7 +43,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{

diff --git a/app/metal-controller-manager/api/v1alpha1/groupversion_info.go b/app/metal-controller-manager/api/v1alpha1/groupversion_info.go
@@ -13,10 +13,10 @@ import (
 )
 
 var (
-	// GroupVersion is group version used to register these objects
+	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "metal.sidero.dev", Version: "v1alpha1"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.

diff --git a/app/metal-controller-manager/controllers/suite_test.go b/app/metal-controller-manager/controllers/suite_test.go
@@ -42,7 +42,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{

diff --git a/app/metal-controller-manager/internal/metadata/metadata_server.go b/app/metal-controller-manager/internal/metadata/metadata_server.go
@@ -248,7 +248,7 @@ func (m *metadataConfigs) FetchConfig(w http.ResponseWriter, r *http.Request) {
 func patchConfigs(decodedData []byte, patches []metalv1alpha1.ConfigPatches) ([]byte, errorWithCode) {
 	marshalledPatches, err := json.Marshal(patches)
 	if err != nil {
-		return nil, errorWithCode{http.StatusInternalServerError, fmt.Errorf("failure marshalling config patches from server: %s", err)}
+		return nil, errorWithCode{http.StatusInternalServerError, fmt.Errorf("failure marshaling config patches from server: %s", err)}
 	}
 
 	jsonDecodedData, err := yaml.YAMLToJSON(decodedData)