fix the golint issue

Signed-off-by: fisherxu <xufei40@huawei.com>

9 files changed, 18 insertions, 21 deletions

diff --git a/cloud/pkg/dynamiccontroller/application/application.go b/cloud/pkg/dynamiccontroller/application/application.go
index 23be93804..df69a32b3 100644
--- a/cloud/pkg/dynamiccontroller/application/application.go
+++ b/cloud/pkg/dynamiccontroller/application/application.go
@@ -80,7 +80,7 @@ type PatchInfo struct {
 // 0.use Agent.Generate to generate application
 // 1.use Agent.Apply to apply application( generate msg and send it to cloud dynamiccontroller)
 type Application struct {
-	Id       string
+	ID       string
 	Key      string // group version resource namespaces name
 	Verb     applicationVerb
 	Nodename string
@@ -126,16 +126,16 @@ func newApplication(ctx context.Context, key string, verb applicationVerb, noden
 }
 
 func (a *Application) Identifier() string {
-	if a.Id != "" {
-		return a.Id
+	if a.ID != "" {
+		return a.ID
 	}
 	b := []byte(a.Nodename)
 	b = append(b, []byte(a.Key)...)
 	b = append(b, []byte(a.Verb)...)
 	b = append(b, a.Option...)
 	b = append(b, a.ReqBody...)
-	a.Id = fmt.Sprintf("%x", md5.Sum(b))
-	return a.Id
+	a.ID = fmt.Sprintf("%x", md5.Sum(b))
+	return a.ID
 }
 func (a *Application) String() string {
 	return fmt.Sprintf("(NodeName=%v;Key=%v;Verb=%v;Status=%v;Reason=%v)", a.Nodename, a.Key, a.Verb, a.Status, a.Reason)
@@ -299,7 +299,7 @@ func (a *Agent) doApply(app *Application) {
 
 	// encapsulate as a message
 	app.Status = InApplying
-	msg := model.NewMessage("").SetRoute(MetaServerSource, modules.DynamicControllerModuleGroup).FillBody(*app)
+	msg := model.NewMessage("").SetRoute(MetaServerSource, modules.DynamicControllerModuleGroup).FillBody(app)
 	msg.SetResourceOperation("null", "null")
 	resp, err := beehiveContext.SendSync(edgehub.ModuleNameEdgeHub, *msg, 10*time.Second)
 	if err != nil {
@@ -499,7 +499,7 @@ func (c *Center) Response(app *Application, parentID string, status applicationS
 	}
 
 	msg := model.NewMessage(parentID)
-	msg.Content = *app
+	msg.Content = app
 	resource, err := messagelayer.BuildResource(app.Nodename, Ignore, ApplicationResource, Ignore)
 	if err != nil {
 		klog.Warningf("built message resource failed with error: %s", err)
diff --git a/edge/pkg/metamanager/metaserver/handlerfactory/handler.go b/edge/pkg/metamanager/metaserver/handlerfactory/handler.go
index 358dc6dcf..e02dcc978 100644
--- a/edge/pkg/metamanager/metaserver/handlerfactory/handler.go
+++ b/edge/pkg/metamanager/metaserver/handlerfactory/handler.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"k8s.io/klog/v2"
 	"net/http"
 	"strings"
 	"time"
@@ -20,11 +19,11 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/handlers"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	apirequest "k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/klog/v2"
 
 	"github.com/kubeedge/kubeedge/cloud/pkg/dynamiccontroller/application"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/metaserver/kubernetes/fakers"
-	. "github.com/kubeedge/kubeedge/edge/pkg/metamanager/metaserver/kubernetes/scope"
+	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/metaserver/kubernetes/scope"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/metaserver/kubernetes/storage"
 	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 )
@@ -41,7 +40,7 @@ func NewFactory() Factory {
 	utilruntime.Must(err)
 	f := Factory{
 		storage:           s,
-		scope:             NewRequestScope(),
+		scope:             scope.NewRequestScope(),
 		MinRequestTimeout: 1800 * time.Second,
 		handlers:          make(map[string]http.Handler),
 	}
@@ -65,7 +64,7 @@ func (f *Factory) List() http.Handler {
 }
 
 func (f *Factory) Create(req *request.RequestInfo) http.Handler {
-	s := NewRequestScope()
+	s := scope.NewRequestScope()
 	s.Kind = schema.GroupVersionKind{
 		Group:   req.APIGroup,
 		Version: req.APIVersion,
@@ -85,7 +84,7 @@ func (f *Factory) Delete() http.Handler {
 }
 
 func (f *Factory) Update(req *request.RequestInfo) http.Handler {
-	s := NewRequestScope()
+	s := scope.NewRequestScope()
 	s.Kind = schema.GroupVersionKind{
 		Group:   req.APIGroup,
 		Version: req.APIVersion,
@@ -96,7 +95,7 @@ func (f *Factory) Update(req *request.RequestInfo) http.Handler {
 }
 
 func (f *Factory) Patch(reqInfo *request.RequestInfo) http.Handler {
-	scope := wrapScope{RequestScope: NewRequestScope()}
+	scope := wrapScope{RequestScope: scope.NewRequestScope()}
 	scope.Kind = schema.GroupVersionKind{
 		Group:   reqInfo.APIGroup,
 		Version: reqInfo.APIVersion,
@@ -147,7 +146,7 @@ func (f *Factory) Patch(reqInfo *request.RequestInfo) http.Handler {
 		}
 		options.TypeMeta.SetGroupVersionKind(metav1.SchemeGroupVersion.WithKind("PatchOptions"))
 
-		reqInfo, _ := apirequest.RequestInfoFrom(req.Context())
+		reqInfo, _ := request.RequestInfoFrom(req.Context())
 		pi := application.PatchInfo{
 			Name:         name,
 			PatchType:    patchType,
diff --git a/edge/pkg/metamanager/metaserver/kubernetes/storage/storage.go b/edge/pkg/metamanager/metaserver/kubernetes/storage/storage.go
index fea219970..e3a4fe906 100644
--- a/edge/pkg/metamanager/metaserver/kubernetes/storage/storage.go
+++ b/edge/pkg/metamanager/metaserver/kubernetes/storage/storage.go
@@ -104,7 +104,7 @@ func (r *REST) Get(ctx context.Context, name string, options *metav1.GetOptions)
 	if err != nil {
 		obj, err = r.Store.Get(ctx, "", options) // name is needless, we get all key information from ctx
 		if err != nil {
-			return nil, errors.NewNotFound(schema.GroupResource{info.APIGroup, info.Resource}, info.Name)
+			return nil, errors.NewNotFound(schema.GroupResource{Group: info.APIGroup, Resource: info.Resource}, info.Name)
 		}
 		klog.Infof("[metaserver/reststorage] successfully process get req (%v) at local", path)
 	}
diff --git a/pkg/metaserver/key.go b/pkg/metaserver/key.go
index c4794fee0..8b4ee0c54 100644
--- a/pkg/metaserver/key.go
+++ b/pkg/metaserver/key.go
@@ -87,7 +87,6 @@ func KeyFuncReq(ctx context.Context, _ string) (string, error) {
 			key += info.Name
 		} else {
 			key += v2.NullName
-
 		}
 	} else {
 		return "", fmt.Errorf("no request info in context")
diff --git a/tests/intergration/framework/cloud.go b/tests/integration/framework/cloud.go
index c6e6f8f0b..d9244b3d1 100644
--- a/tests/intergration/framework/cloud.go
+++ b/tests/integration/framework/cloud.go
@@ -26,7 +26,6 @@ func RunCloud(cfgModifyFn func(config *v1alpha1.CloudCoreConfig)) CloseFunc {
 }
 
 func RunCloudCore(cfg *v1alpha1.CloudCoreConfig) CloseFunc {
-
 	client.InitKubeEdgeClient(cfg.KubeAPIConfig)
 	gis := informers.GetInformersManager()
 	registerModules(cfg)
@@ -37,7 +36,7 @@ func RunCloudCore(cfg *v1alpha1.CloudCoreConfig) CloseFunc {
 
 	closeFn := func() {
 		beehiveContext.Cancel()
-		for name, _ := range core.GetModules() {
+		for name := range core.GetModules() {
 			beehiveContext.Cleanup(name)
 		}
 	}
diff --git a/tests/intergration/framework/edge.go b/tests/integration/framework/edge.go
index d1f69103b..98e77c221 100644
--- a/tests/intergration/framework/edge.go
+++ b/tests/integration/framework/edge.go
@@ -23,7 +23,7 @@ func RunEdgeCore(config *v1alpha1.EdgeCoreConfig) CloseFunc {
 
 	closeFn := func() {
 		beehiveContext.Cancel()
-		for name, _ := range core.GetModules() {
+		for name := range core.GetModules() {
 			beehiveContext.Cleanup(name)
 		}
 	}
diff --git a/tests/intergration/framework/util.go b/tests/integration/framework/util.go
index 3ddc17ecf..3ddc17ecf 100644
--- a/tests/intergration/framework/util.go
+++ b/tests/integration/framework/util.go
diff --git a/tests/intergration/metaserver/access_test.go b/tests/integration/metaserver/access_test.go
index e1805141b..e1805141b 100644
--- a/tests/intergration/metaserver/access_test.go
+++ b/tests/integration/metaserver/access_test.go
diff --git a/tests/intergration/metaserver/main_test.go b/tests/integration/metaserver/main_test.go
index b2349326b..531775b8b 100644
--- a/tests/intergration/metaserver/main_test.go
+++ b/tests/integration/metaserver/main_test.go
@@ -5,7 +5,7 @@ import (
 
 	cloudconfig "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 	edgeconfig "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1"
-	"github.com/kubeedge/kubeedge/tests/intergration/framework"
+	"github.com/kubeedge/kubeedge/tests/integration/framework"
 )
 
 func TestMain(m *testing.M) {