fix: fix lint errors

Author: teodor-pripoae

api/v1/gitopsapi_types.go

@@ -30,7 +30,7 @@ type GitopsAPISpec struct {
 	GitUser       string `json:"gitUser,omitempty"`
 	GitEmail      string `json:"gitEmail,omitempty"`
 	// The branch to use as a baseline for the new branch, defaults to master
-	Base string `json:"branch,omitempty"`
+	Base string `json:"base,omitempty"`
 	// The branch to push updates back to, defaults to master
 	Branch string `json:"branch,omitempty"`
 

connectors/github.go

@@ -129,6 +129,7 @@ func (g *Github) Clone(ctx context.Context, branch, local string) (billy.Filesys
 		return nil, nil, err
 	}
 	if branch != local {
+		// nolint: errcheck
 		work.Checkout(&git.CheckoutOptions{
 			Branch: plumbing.NewBranchReferenceName(local),
 			Create: true,

controllers/gitopsapi_controller.go

@@ -99,13 +99,13 @@ func serve(c echo.Context, r *GitopsAPIReconciler) error {
 		return c.String(http.StatusInternalServerError, err.Error())
 	}
 
-	if hash, pr, err := HandleGitopsAPI(ctx, r.Log, git, api, c.Request().Body); err != nil {
+	hash, pr, err := HandleGitopsAPI(ctx, r.Log, git, api, c.Request().Body)
+
+	if err != nil {
 		r.Log.Error(err, "error pushing to git")
 		return c.String(http.StatusInternalServerError, err.Error())
-	} else {
-
-		return c.String(http.StatusAccepted, fmt.Sprintf("Committed %s, PR: %d ", hash, pr))
 	}
+	return c.String(http.StatusAccepted, fmt.Sprintf("Committed %s, PR: %d ", hash, pr))
 }
 
 func GetKustomizaton(fs billy.Filesystem, path string) (*types.Kustomization, error) {
@@ -123,8 +123,8 @@ func GetKustomizaton(fs billy.Filesystem, path string) (*types.Kustomization, er
 		return nil, err
 	}
 	return &kustomization, nil
-
 }
+
 func HandleGitopsAPI(ctx context.Context, logger logr.Logger, git connectors.Connector, api gitv1.GitopsAPI, contents io.Reader) (hash string, pr int, err error) {
 	if api.Spec.Base == "" {
 		api.Spec.Base = "master"
@@ -187,7 +187,6 @@ func HandleGitopsAPI(ctx context.Context, logger logr.Logger, git connectors.Con
 
 	if err = copy(existingKustomization, kustomizationPath, fs, work); err != nil {
 		return
-
 	}
 	author := &object.Signature{
 		Name:  api.Spec.GitUser,
@@ -230,7 +229,7 @@ func HandleGitopsAPI(ctx context.Context, logger logr.Logger, git connectors.Con
 
 		pr, err = git.OpenPullRequest(ctx, api.Spec.Base, branch, api.Spec.PullRequest)
 	}
-	return
+	return // nolint: nakedret
 }
 
 func (r *GitopsAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {

controllers/utils.go

@@ -14,7 +14,7 @@ func copy(data []byte, path string, fs billy.Filesystem, work *gitv5.Worktree) e
 	if err != nil {
 		return errors.Wrap(err, "failed to open")
 	}
-	src := bytes.NewBuffer([]byte(data))
+	src := bytes.NewBuffer(data)
 	if _, err := io.Copy(dst, src); err != nil {
 		return errors.Wrap(err, "failed to copy")
 	}

test/e2e.go

@@ -28,7 +28,6 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	ctrl "sigs.k8s.io/controller-runtime"
 	crdclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -55,7 +54,6 @@ var (
 	}
 	scheme              = runtime.NewScheme()
 	log                 = ctrl.Log.WithName("e2e")
-	restConfig          *rest.Config
 	pullRequestUsername string
 )