Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use golangci-lint #42

Merged
merged 4 commits into from
Mar 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
push:
branches: [ main ]
name: ci/github

permissions:
contents: read

jobs:
unit:
strategy:
Expand Down Expand Up @@ -33,7 +37,7 @@ jobs:
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go-version }}
- name: Check out code
- name: Checkout code
uses: actions/checkout@v2
- name: Verify fmt
run: make verify-fmt
Expand All @@ -43,6 +47,10 @@ jobs:
run: make verify-manifests
- name: Verify OLM bundle
run: make verify-bundle
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2
with:
args: --timeout=10m
e2e:
strategy:
fail-fast: false
Expand Down
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
linters:
enable:
- gosec
9 changes: 5 additions & 4 deletions controllers/shipwrightbuild_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ package controllers
import (
"context"
"fmt"
"path/filepath"

"github.com/go-logr/logr"
mfc "github.com/manifestival/controller-runtime-client"
"github.com/manifestival/manifestival"
tektonoperatorv1alpha1 "github.com/tektoncd/operator/pkg/apis/operator/v1alpha1"
tektonoperatorv1alpha1client "github.com/tektoncd/operator/pkg/client/clientset/versioned/typed/operator/v1alpha1"
"path/filepath"

corev1 "k8s.io/api/core/v1"
crdclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
Expand Down Expand Up @@ -112,7 +113,7 @@ func (r *ShipwrightBuildReconciler) Reconcile(ctx context.Context, req ctrl.Requ
return RequeueWithError(err)
}
if version.Minor() < 49 {
retErr := fmt.Errorf("Shipwright requires at least v0.49.0 of the Tekton Operator, but the minor number is %d", version.Minor())
retErr := fmt.Errorf("shipwright requires at least v0.49.0 of the Tekton Operator, but the minor number is %d", version.Minor())
return RequeueWithError(retErr)
}

Expand Down Expand Up @@ -245,7 +246,7 @@ func (r *ShipwrightBuildReconciler) Reconcile(ctx context.Context, req ctrl.Requ
Reason: "Failed",
Message: fmt.Sprintf("Reconciling ShipwrightBuild failed: %v", err),
})
r.Client.Status().Update(ctx, b)
err = r.Client.Status().Update(ctx, b)
return RequeueWithError(err)
}
if err := r.setFinalizer(ctx, b); err != nil {
Expand All @@ -261,7 +262,7 @@ func (r *ShipwrightBuildReconciler) Reconcile(ctx context.Context, req ctrl.Requ
})
if err := r.Client.Status().Update(ctx, b); err != nil {
logger.Error(err, "updating ShipwrightBuild status")
RequeueWithError(err)
RequeueWithError(err) //nolint:errcheck
}
logger.Info("All done!")
return NoRequeue()
Expand Down
8 changes: 4 additions & 4 deletions controllers/shipwrightbuild_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ func bootstrapShipwrightBuildReconciler(

logger := zap.New()

c := fake.NewFakeClientWithScheme(s, b)
crdClient := &crdclientv1.Clientset{}
toClient := &tektonoperatorv1alpha1client.Clientset{}
if tcrds != nil && len(tcrds) > 0 {
c := fake.NewFakeClientWithScheme(s, b) //nolint:golint,staticcheck
var crdClient *crdclientv1.Clientset
var toClient *tektonoperatorv1alpha1client.Clientset
if len(tcrds) > 0 {
objs := []runtime.Object{}
for _, obj := range tcrds {
objs = append(objs, obj)
Expand Down
9 changes: 4 additions & 5 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ package controllers

import (
"context"
tektonoperatorv1alpha1client "github.com/tektoncd/operator/pkg/client/clientset/versioned/typed/operator/v1alpha1"
crdclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
"path/filepath"
"testing"
"time"

tektonoperatorv1alpha1client "github.com/tektoncd/operator/pkg/client/clientset/versioned/typed/operator/v1alpha1"
crdclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
Expand All @@ -32,7 +32,6 @@ import (
// These tests use Ginkgo (BDD-style Go testing framework). Refer to
// http://onsi.github.io/ginkgo/ to learn more about Ginkgo.

var cfg *rest.Config
var k8sClient client.Client
var ctx context.Context
var testEnv *envtest.Environment
Expand Down Expand Up @@ -74,7 +73,7 @@ var _ = BeforeSuite(func() {
Expect(err).NotTo(HaveOccurred())
crdClient, err := crdclientv1.NewForConfig(mgr.GetConfig())
Expect(err).NotTo(HaveOccurred())
toClient, err := tektonoperatorv1alpha1client.NewForConfig(mgr.GetConfig())
toClient, _ := tektonoperatorv1alpha1client.NewForConfig(mgr.GetConfig())
err = (&ShipwrightBuildReconciler{
CRDClient: crdClient,
TektonOperatorClient: toClient,
Expand Down