Fix golint findings, remove unused code

pkg/apis/camel/v1alpha1/register.go

@@ -31,14 +31,15 @@ const (
 )
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
 	// SchemeGroupVersion is the group version used to register these objects.
 	SchemeGroupVersion = schema.GroupVersion{Group: groupName, Version: version}
 )
 
 func init() {
-	sdkK8sutil.AddToSDKScheme(AddToScheme)
+	schemeBuilder := runtime.NewSchemeBuilder(addKnownTypes)
+	addToScheme := schemeBuilder.AddToScheme
+
+	sdkK8sutil.AddToSDKScheme(addToScheme)
 }
 
 // addKnownTypes adds the set of types defined in this package to the supplied scheme.

pkg/build/local/local_builder.go

@@ -111,11 +111,11 @@ func (b *localBuilder) buildCycle(ctx context.Context) {
 }
 
 func (b *localBuilder) execute(source build.Request) (string, error) {
-	project, err := generateProjectDefinition(source)
+	integration, err := generateIntegration(source)
 	if err != nil {
 		return "", err
 	}
-	tarFileName, err := maven.Build(project)
+	tarFileName, err := maven.Build(integration)
 	if err != nil {
 		return "", err
 	}
@@ -254,24 +254,24 @@ func (b *localBuilder) publish(tarFile string, source build.Request) (string, er
 	return is.Status.DockerImageRepository + ":" + source.Identifier.Qualifier, nil
 }
 
-func generateProjectDefinition(source build.Request) (maven.ProjectDefinition, error) {
-	project := maven.ProjectDefinition{
+func generateIntegration(source build.Request) (maven.Integration, error) {
+	integration := maven.Integration{
 		Project: maven.Project{
 			XMLName:           xml.Name{Local: "project"},
-			XmlNs:             "http://maven.apache.org/POM/4.0.0",
-			XmlNsXsi:          "http://www.w3.org/2001/XMLSchema-instance",
+			XMLNs:             "http://maven.apache.org/POM/4.0.0",
+			XMLNsXsi:          "http://www.w3.org/2001/XMLSchema-instance",
 			XsiSchemaLocation: "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd",
 			ModelVersion:      "4.0.0",
-			GroupId:           "org.apache.camel.k.integration",
-			ArtifactId:        "camel-k-integration",
+			GroupID:           "org.apache.camel.k.integration",
+			ArtifactID:        "camel-k-integration",
 			Version:           version.Version,
 			DependencyManagement: maven.DependencyManagement{
 				Dependencies: maven.Dependencies{
 					Dependencies: []maven.Dependency{
 						{
 							//TODO: camel version should be retrieved from an external source or provided as static version
-							GroupId:    "org.apache.camel",
-							ArtifactId: "camel-bom",
+							GroupID:    "org.apache.camel",
+							ArtifactID: "camel-bom",
 							Version:    "2.22.1",
 							Type:       "pom",
 							Scope:      "import",
@@ -291,7 +291,7 @@ func generateProjectDefinition(source build.Request) (maven.ProjectDefinition, e
 	// set-up dependencies
 	//
 
-	deps := &project.Project.Dependencies
+	deps := &integration.Project.Dependencies
 	deps.AddGAV("org.apache.camel.k", "camel-k-runtime-jvm", version.Version)
 
 	for _, d := range source.Dependencies {
@@ -309,9 +309,9 @@ func generateProjectDefinition(source build.Request) (maven.ProjectDefinition, e
 
 			deps.AddEncodedGAV(gav)
 		} else {
-			return maven.ProjectDefinition{}, fmt.Errorf("unknown dependency type: %s", d)
+			return maven.Integration{}, fmt.Errorf("unknown dependency type: %s", d)
 		}
 	}
 
-	return project, nil
+	return integration, nil
 }

pkg/build/local/local_builder_test.go

@@ -43,16 +43,16 @@ func TestProjectGeneration(t *testing.T) {
 		},
 	}
 
-	prj, err := generateProjectDefinition(source)
+	prj, err := generateIntegration(source)
 	assert.Nil(t, err)
 	assert.NotNil(t, prj)
 	assert.Equal(t, len(prj.Project.Dependencies.Dependencies), 5)
-	assert.Equal(t, prj.Project.Dependencies.Dependencies[0].ArtifactId, "camel-k-runtime-jvm")
-	assert.Equal(t, prj.Project.Dependencies.Dependencies[1].ArtifactId, "camel-mail")
-	assert.Equal(t, prj.Project.Dependencies.Dependencies[2].ArtifactId, "camel-netty4")
-	assert.Equal(t, prj.Project.Dependencies.Dependencies[3].ArtifactId, "camel-servicenow")
+	assert.Equal(t, prj.Project.Dependencies.Dependencies[0].ArtifactID, "camel-k-runtime-jvm")
+	assert.Equal(t, prj.Project.Dependencies.Dependencies[1].ArtifactID, "camel-mail")
+	assert.Equal(t, prj.Project.Dependencies.Dependencies[2].ArtifactID, "camel-netty4")
+	assert.Equal(t, prj.Project.Dependencies.Dependencies[3].ArtifactID, "camel-servicenow")
 	assert.Equal(t, prj.Project.Dependencies.Dependencies[3].Version, "2.21.1")
-	assert.Equal(t, prj.Project.Dependencies.Dependencies[4].ArtifactId, "camel-salesforce")
+	assert.Equal(t, prj.Project.Dependencies.Dependencies[4].ArtifactID, "camel-salesforce")
 	assert.Equal(t, prj.Project.Dependencies.Dependencies[4].Version, "")
 }
 
@@ -75,6 +75,6 @@ func TestProjectGenerationWithFailure(t *testing.T) {
 		},
 	}
 
-	_, err := generateProjectDefinition(source)
+	_, err := generateIntegration(source)
 	assert.NotNil(t, err)
 }

pkg/client/cmd/context.go

@@ -21,8 +21,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// NewCmdContext --
-func NewCmdContext(rootCmdOptions *RootCmdOptions) *cobra.Command {
+func newCmdContext(rootCmdOptions *RootCmdOptions) *cobra.Command {
 	cmd := cobra.Command{
 		Use:   "context",
 		Short: "Configure an Integration Context",

pkg/client/cmd/get.go

@@ -28,12 +28,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type GetCmdOptions struct {
+type getCmdOptions struct {
 	*RootCmdOptions
 }
 
-func NewCmdGet(rootCmdOptions *RootCmdOptions) *cobra.Command {
-	options := GetCmdOptions{
+func newCmdGet(rootCmdOptions *RootCmdOptions) *cobra.Command {
+	options := getCmdOptions{
 		RootCmdOptions: rootCmdOptions,
 	}
 	cmd := cobra.Command{
@@ -46,7 +46,7 @@ func NewCmdGet(rootCmdOptions *RootCmdOptions) *cobra.Command {
 	return &cmd
 }
 
-func (o *GetCmdOptions) run(cmd *cobra.Command, args []string) error {
+func (o *getCmdOptions) run(cmd *cobra.Command, args []string) error {
 	integrationList := v1alpha1.IntegrationList{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: v1alpha1.SchemeGroupVersion.String(),

pkg/client/cmd/install.go

@@ -23,13 +23,12 @@ import (
 	"os"
 
 	"github.com/apache/camel-k/pkg/install"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	"github.com/pkg/errors"
 )
 
-// NewCmdInstall --
-func NewCmdInstall(rootCmdOptions *RootCmdOptions) *cobra.Command {
+func newCmdInstall(rootCmdOptions *RootCmdOptions) *cobra.Command {
 	options := installCmdOptions{
 		RootCmdOptions: rootCmdOptions,
 	}

pkg/client/cmd/root.go

@@ -73,11 +73,11 @@ func NewKamelCommand(ctx context.Context) (*cobra.Command, error) {
 	}
 
 	cmd.AddCommand(newCmdCompletion(&cmd))
-	cmd.AddCommand(NewCmdVersion())
-	cmd.AddCommand(NewCmdRun(&options))
-	cmd.AddCommand(NewCmdGet(&options))
-	cmd.AddCommand(NewCmdInstall(&options))
-	cmd.AddCommand(NewCmdContext(&options))
+	cmd.AddCommand(newCmdVersion())
+	cmd.AddCommand(newCmdRun(&options))
+	cmd.AddCommand(newCmdGet(&options))
+	cmd.AddCommand(newCmdInstall(&options))
+	cmd.AddCommand(newCmdContext(&options))
 
 	return &cmd, nil
 }

pkg/client/cmd/run.go

@@ -20,13 +20,14 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/apache/camel-k/pkg/util/sync"
-	"github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
 
+	"github.com/apache/camel-k/pkg/util/sync"
+	"github.com/sirupsen/logrus"
+
 	"io"
 
 	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
@@ -39,8 +40,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// NewCmdRun --
-func NewCmdRun(rootCmdOptions *RootCmdOptions) *cobra.Command {
+func newCmdRun(rootCmdOptions *RootCmdOptions) *cobra.Command {
 	options := runCmdOptions{
 		RootCmdOptions: rootCmdOptions,
 	}
@@ -134,7 +134,7 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args []string) error {
 
 func (o *runCmdOptions) waitForIntegrationReady(integration *v1alpha1.Integration) error {
 	// Block this goroutine until the integration is in a final status
-	changes, err := watch.WatchStateChanges(o.Context, integration)
+	changes, err := watch.StateChanges(o.Context, integration)
 	if err != nil {
 		return err
 	}

pkg/client/cmd/version.go

@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func NewCmdVersion() *cobra.Command {
+func newCmdVersion() *cobra.Command {
 	return &cobra.Command{
 		Use:   "version",
 		Short: "Display client version",

pkg/install/cluster.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 )
 
+// SetupClusterwideResources --
 func SetupClusterwideResources() error {
 
 	// Install CRD for Integration Context (if needed)
@@ -56,6 +57,7 @@ func SetupClusterwideResources() error {
 	return nil
 }
 
+// IsCRDInstalled check if the given CRT kind is installed
 func IsCRDInstalled(kind string) (bool, error) {
 	lst, err := k8sclient.GetKubeClient().Discovery().ServerResourcesForGroupVersion("camel.apache.org/v1alpha1")
 	if err != nil && errors.IsNotFound(err) {
@@ -82,7 +84,7 @@ func installCRD(kind string, resourceName string) error {
 	}
 
 	crd := []byte(deploy.Resources[resourceName])
-	crdJson, err := yaml.ToJSON(crd)
+	crdJSON, err := yaml.ToJSON(crd)
 	if err != nil {
 		return err
 	}
@@ -93,7 +95,7 @@ func installCRD(kind string, resourceName string) error {
 	// Post using dynamic client
 	result := restClient.
 		Post().
-		Body(crdJson).
+		Body(crdJSON).
 		Resource("customresourcedefinitions").
 		Do()
 	// Check result
@@ -104,6 +106,7 @@ func installCRD(kind string, resourceName string) error {
 	return nil
 }
 
+// IsClusterRoleInstalled check if cluster role camel-k:edit is installed
 func IsClusterRoleInstalled() (bool, error) {
 	clusterRole := v1.ClusterRole{
 		TypeMeta: metav1.TypeMeta{

pkg/stub/action/context/action.go

@@ -21,6 +21,7 @@ import (
 	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
 )
 
+// IntegrationContextAction --
 type IntegrationContextAction interface {
 
 	// a user friendly name for the action