diff options
31 files changed, 81 insertions, 101 deletions
diff --git a/.golangci.yml b/.golangci.yml index 35bbc266a..ae614766b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -47,5 +47,6 @@ linters: enable: - gofmt - golint + - gosimple - misspell - whitespace diff --git a/cloud/pkg/cloudhub/servers/httpserver/signcerts.go b/cloud/pkg/cloudhub/servers/httpserver/signcerts.go index abd945b4f..ffdb47af2 100644 --- a/cloud/pkg/cloudhub/servers/httpserver/signcerts.go +++ b/cloud/pkg/cloudhub/servers/httpserver/signcerts.go @@ -87,15 +87,9 @@ func GenerateToken() error { t := time.NewTicker(time.Hour * 12) go func() { for { - select { - case <-t.C: - refreshedCaHashToken := refreshToken() - err := CreateTokenSecret([]byte(refreshedCaHashToken)) - if err != nil { - klog.Errorf("Failed to create tokenSecret, err: %v", err) - return - } - } + <-t.C + refreshedCaHashToken := refreshToken() + CreateTokenSecret([]byte(refreshedCaHashToken)) } }() klog.Info("Succeed to creating token") diff --git a/cloud/pkg/devicecontroller/controller/downstream.go b/cloud/pkg/devicecontroller/controller/downstream.go index f293fa9ce..6a93a2be6 100644 --- a/cloud/pkg/devicecontroller/controller/downstream.go +++ b/cloud/pkg/devicecontroller/controller/downstream.go @@ -240,7 +240,7 @@ func (dc *DownstreamController) addDeviceProfile(device *v1alpha1.Device, config break } } - if checkModelExists != true { + if !checkModelExists { addDeviceModelAndVisitors(deviceModel, deviceProfile) } bytes, err := json.Marshal(deviceProfile) @@ -702,7 +702,7 @@ func (dc *DownstreamController) deleteFromDeviceProfile(device *v1alpha1.Device, break } } - if checkModelReferenced != true { + if !checkModelReferenced { deleteDeviceModelAndVisitors(deviceModel, deviceProfile) } bytes, err := json.Marshal(deviceProfile) diff --git a/cloud/pkg/edgecontroller/controller/upstream.go b/cloud/pkg/edgecontroller/controller/upstream.go index e0561ec30..5a0a803a6 100644 --- a/cloud/pkg/edgecontroller/controller/upstream.go +++ b/cloud/pkg/edgecontroller/controller/upstream.go @@ -410,11 +410,11 @@ func (uc *UpstreamController) updateNodeStatus() { // In case the status stored at metadata service is outdated, update the heartbeat automatically if !config.Config.EdgeSiteEnable { for i := range nodeStatusRequest.Status.Conditions { - if time.Now().Sub(nodeStatusRequest.Status.Conditions[i].LastHeartbeatTime.Time) > time.Duration(config.Config.NodeUpdateFrequency)*time.Second { + if time.Since(nodeStatusRequest.Status.Conditions[i].LastHeartbeatTime.Time) > time.Duration(config.Config.NodeUpdateFrequency)*time.Second { nodeStatusRequest.Status.Conditions[i].LastHeartbeatTime = metaV1.NewTime(time.Now()) } - if time.Now().Sub(nodeStatusRequest.Status.Conditions[i].LastTransitionTime.Time) > time.Duration(config.Config.NodeUpdateFrequency)*time.Second { + if time.Since(nodeStatusRequest.Status.Conditions[i].LastTransitionTime.Time) > time.Duration(config.Config.NodeUpdateFrequency)*time.Second { nodeStatusRequest.Status.Conditions[i].LastTransitionTime = metaV1.NewTime(time.Now()) } } @@ -1201,8 +1201,6 @@ func (uc *UpstreamController) nodeMsgResponse(nodeName, namespace, content strin klog.Warningf("Response message: %s failed, response failed with error: %s", msg.GetID(), err) return } - - return } // NewUpstreamController create UpstreamController from config diff --git a/cloud/pkg/leaderelection/leaderelection.go b/cloud/pkg/leaderelection/leaderelection.go index 4bf36d180..218c2f739 100644 --- a/cloud/pkg/leaderelection/leaderelection.go +++ b/cloud/pkg/leaderelection/leaderelection.go @@ -86,7 +86,6 @@ func Run(cfg *config.CloudCoreConfig, readyzAdaptor *ReadyzAdaptor) { // Monitor system signal and shutdown gracefully and it should be in main gorutine core.GracefulShutdown() - return } // makeLeaderElectionConfig builds a leader election configuration. It will @@ -125,7 +124,7 @@ func makeLeaderElectionConfig(config componentbaseconfig.LeaderElectionConfigura // Try to patch PodReadinessGate if program runs in pod func TryToPatchPodReadinessGate() error { podname, isInPod := os.LookupEnv("CLOUDCORE_POD_NAME") - if isInPod == true { + if isInPod { namespace := os.Getenv("CLOUDCORE_POD_NAMESPACE") klog.Infof("CloudCore is running in pod %v/%v, try to patch PodReadinessGate", namespace, podname) //TODO: use specific clients diff --git a/edge/cmd/edgecore/app/server.go b/edge/cmd/edgecore/app/server.go index 8c105779a..b1810989d 100644 --- a/edge/cmd/edgecore/app/server.go +++ b/edge/cmd/edgecore/app/server.go @@ -131,14 +131,14 @@ func environmentCheck() error { // if kubelet is running, return error if find, err := findProcess("kubelet"); err != nil { return err - } else if find == true { + } else if find { return errors.New("Kubelet should not running on edge node when running edgecore") } // if kube-proxy is running, return error if find, err := findProcess("kube-proxy"); err != nil { return err - } else if find == true { + } else if find { return errors.New("Kube-proxy should not running on edge node when running edgecore") } diff --git a/edge/pkg/devicetwin/dtmanager/membership.go b/edge/pkg/devicetwin/dtmanager/membership.go index dc9ce3788..483001c0d 100644 --- a/edge/pkg/devicetwin/dtmanager/membership.go +++ b/edge/pkg/devicetwin/dtmanager/membership.go @@ -167,7 +167,7 @@ func Added(context *dtcontext.DTContext, toAdd []dttype.Device, baseMessage dtty if !delta { baseMessage.EventID = "" } - if toAdd == nil || len(toAdd) == 0 { + if len(toAdd) == 0 { return } dealType := 0 diff --git a/edge/pkg/devicetwin/process.go b/edge/pkg/devicetwin/process.go index 57ce1845c..07b2ac30b 100644 --- a/edge/pkg/devicetwin/process.go +++ b/edge/pkg/devicetwin/process.go @@ -157,9 +157,7 @@ func SyncDeviceFromSqlite(context *dtcontext.DTContext, deviceID string) error { return err } attributes := make([]dtclient.DeviceAttr, 0) - for _, attr := range *deviceAttr { - attributes = append(attributes, attr) - } + attributes = append(attributes, *deviceAttr...) deviceTwin, err := dtclient.QueryDeviceTwin("deviceid", deviceID) if err != nil { @@ -167,9 +165,7 @@ func SyncDeviceFromSqlite(context *dtcontext.DTContext, deviceID string) error { return err } twins := make([]dtclient.DeviceTwin, 0) - for _, twin := range *deviceTwin { - twins = append(twins, twin) - } + twins = append(twins, *deviceTwin...) context.DeviceList.Store(deviceID, &dttype.Device{ ID: deviceID, diff --git a/edge/pkg/edged/edged_status.go b/edge/pkg/edged/edged_status.go index cf7d50132..0aa72a48f 100644 --- a/edge/pkg/edged/edged_status.go +++ b/edge/pkg/edged/edged_status.go @@ -380,7 +380,7 @@ func (e *edged) registerNode() error { e.setInitNode(node) - if config.Config.RegisterNode == false { + if !config.Config.RegisterNode { //when register-node set to false, do not auto register node klog.Infof("register-node is set to false") e.registrationCompleted = true diff --git a/edge/pkg/edged/status/status_manager.go b/edge/pkg/edged/status/status_manager.go index 64daf796d..a5ff9154a 100644 --- a/edge/pkg/edged/status/status_manager.go +++ b/edge/pkg/edged/status/status_manager.go @@ -54,10 +54,8 @@ func (m *manager) Start() { syncTicker := time.Tick(syncPeriod) go wait.Forever(func() { - select { - case <-syncTicker: - m.updatePodStatus() - } + <-syncTicker + m.updatePodStatus() }, 0) } diff --git a/edge/pkg/edged/volume/csi/csi_mounter.go b/edge/pkg/edged/volume/csi/csi_mounter.go index 527375222..70e07af69 100644 --- a/edge/pkg/edged/volume/csi/csi_mounter.go +++ b/edge/pkg/edged/volume/csi/csi_mounter.go @@ -308,7 +308,7 @@ func (c *csiMountMgr) podAttributes() (map[string]string, error) { } // if PodInfoOnMount is not set or false we do not set pod attributes - if csiDriver.Spec.PodInfoOnMount == nil || *csiDriver.Spec.PodInfoOnMount == false { + if csiDriver.Spec.PodInfoOnMount == nil || !*csiDriver.Spec.PodInfoOnMount { klog.V(4).Infof(log("CSIDriver %q does not require pod information", c.driverName)) return nil, nil } diff --git a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go index 6755dd2ac..1c7a736d3 100644 --- a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go +++ b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go @@ -324,7 +324,7 @@ func removeNodeIDFromNode(csiDriverName string) nodeUpdateFunc { // topology information. func updateTopologyLabels(topology map[string]string) nodeUpdateFunc { return func(node *v1.Node) (*v1.Node, bool, error) { - if topology == nil || len(topology) == 0 { + if len(topology) == 0 { return node, false, nil } diff --git a/edge/test/integration/utils/common/log.go b/edge/test/integration/utils/common/log.go index 5a93357e7..d1267c07f 100755 --- a/edge/test/integration/utils/common/log.go +++ b/edge/test/integration/utils/common/log.go @@ -51,7 +51,7 @@ func PrintTestcaseNameandStatus() { var testdesc ginkgo.GinkgoTestDescription var Status string testdesc = ginkgo.CurrentGinkgoTestDescription() - if testdesc.Failed == true { + if testdesc.Failed { Status = "FAILED" } else { Status = "PASSED" diff --git a/edge/test/integration/utils/helpers/helpers.go b/edge/test/integration/utils/helpers/helpers.go index daa47a442..f18c6f628 100644 --- a/edge/test/integration/utils/helpers/helpers.go +++ b/edge/test/integration/utils/helpers/helpers.go @@ -266,7 +266,7 @@ func HandleAddAndDeleteDevice(operation, testMgrEndPoint string, device dttype.D common.Fatalf("HTTP request is failed :%v", err) return false } - common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) return true } @@ -309,7 +309,7 @@ func HandleAddAndDeletePods(operation string, edgedpoint string, UID string, con common.Fatalf("HTTP request is failed :%v", err) return false } - common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) return true } @@ -330,7 +330,7 @@ func GetPods(EdgedEndpoint string) (v1.PodList, error) { common.Fatalf("Sending HTTP request failed: %v", err) return pods, nil } - common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) defer resp.Body.Close() contents, err := ioutil.ReadAll(resp.Body) if err != nil { diff --git a/edge/test/test.go b/edge/test/test.go index dfff3cb20..80c89fc89 100644 --- a/edge/test/test.go +++ b/edge/test/test.go @@ -65,7 +65,7 @@ func GetPodListFromEdged(w http.ResponseWriter) error { klog.Errorf("Sending HTTP request failed: %v", err) return err } - klog.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + klog.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) defer resp.Body.Close() contents, err := ioutil.ReadAll(resp.Body) if err != nil { diff --git a/edgemesh/pkg/dns/dns.go b/edgemesh/pkg/dns/dns.go index 2b77e0236..57d4bf00b 100644 --- a/edgemesh/pkg/dns/dns.go +++ b/edgemesh/pkg/dns/dns.go @@ -202,10 +202,7 @@ func parseDNSQuery(req []byte) (que *dnsQuestion, err error) { // isAQuery judges if the dns pkg is a query func (h *dnsHeader) isAQuery() bool { - if h.flags&dnsQR != dnsQR { - return true - } - return false + return h.flags&dnsQR != dnsQR } // getHeader gets dns pkg head diff --git a/edgemesh/pkg/listener/listener.go b/edgemesh/pkg/listener/listener.go index 14c589c57..f1c73130a 100644 --- a/edgemesh/pkg/listener/listener.go +++ b/edgemesh/pkg/listener/listener.go @@ -360,7 +360,6 @@ func MsgProcess(msg model.Message) { klog.Warningf("[EdgeMesh] invalid %s operation on podlist", msg.GetOperation()) } } - return } // addServer adds a server @@ -387,7 +386,6 @@ func addServer(svcName, svcPorts string) { klog.Errorf("[EdgeMesh] add listener %s to edge db error: %v", svcName, err) return } - return } // updateServer updates a server diff --git a/edgemesh/pkg/protocol/http/http.go b/edgemesh/pkg/protocol/http/http.go index a38738c29..9e84921f3 100644 --- a/edgemesh/pkg/protocol/http/http.go +++ b/edgemesh/pkg/protocol/http/http.go @@ -109,7 +109,7 @@ func (p *HTTP) responseCallback(data *invocation.Response) error { StatusCode: http.StatusServiceUnavailable, Proto: p.req.Proto, Request: p.req, - Header: make(http.Header, 0), + Header: make(http.Header), } respBytes, _ = httpResponseToBytes(resp) // send error response back diff --git a/keadm/cmd/keadm/app/cmd/cloud/init.go b/keadm/cmd/keadm/app/cmd/cloud/init.go index d80346781..bd77c2a04 100644 --- a/keadm/cmd/keadm/app/cmd/cloud/init.go +++ b/keadm/cmd/keadm/app/cmd/cloud/init.go @@ -51,8 +51,8 @@ func NewCloudInit(out io.Writer, init *types.InitOptions) *cobra.Command { init = newInitOptions() } - tools := make(map[string]types.ToolsInstaller, 0) - flagVals := make(map[string]types.FlagData, 0) + tools := make(map[string]types.ToolsInstaller) + flagVals := make(map[string]types.FlagData) var cmd = &cobra.Command{ Use: "init", @@ -78,8 +78,7 @@ func NewCloudInit(out io.Writer, init *types.InitOptions) *cobra.Command { //newInitOptions will initialise new instance of options everytime func newInitOptions() *types.InitOptions { - var opts *types.InitOptions - opts = &types.InitOptions{} + opts := &types.InitOptions{} opts.KubeConfig = types.DefaultKubeConfig return opts } diff --git a/keadm/cmd/keadm/app/cmd/edge/join.go b/keadm/cmd/keadm/app/cmd/edge/join.go index 3c80877b8..d6d4d2b3b 100644 --- a/keadm/cmd/keadm/app/cmd/edge/join.go +++ b/keadm/cmd/keadm/app/cmd/edge/join.go @@ -50,8 +50,8 @@ func NewEdgeJoin(out io.Writer, joinOptions *types.JoinOptions) *cobra.Command { joinOptions = newJoinOptions() } - tools := make(map[string]types.ToolsInstaller, 0) - flagVals := make(map[string]types.FlagData, 0) + tools := make(map[string]types.ToolsInstaller) + flagVals := make(map[string]types.FlagData) cmd := &cobra.Command{ Use: "join", diff --git a/keadm/cmd/keadm/app/cmd/reset.go b/keadm/cmd/keadm/app/cmd/reset.go index df7bfda80..8f7e983bb 100644 --- a/keadm/cmd/keadm/app/cmd/reset.go +++ b/keadm/cmd/keadm/app/cmd/reset.go @@ -81,7 +81,7 @@ func NewKubeEdgeReset(out io.Writer) *cobra.Command { func TearDownKubeEdge(isEdgeNode bool) error { var ke types.ToolsInstaller ke = &util.KubeCloudInstTool{Common: util.Common{}} - if false != isEdgeNode { + if isEdgeNode { ke = &util.KubeEdgeInstTool{Common: util.Common{}} } diff --git a/keadm/cmd/keadm/app/cmd/util/common.go b/keadm/cmd/keadm/app/cmd/util/common.go index 1d7dc0ccd..b170ea5e2 100644 --- a/keadm/cmd/keadm/app/cmd/util/common.go +++ b/keadm/cmd/keadm/app/cmd/util/common.go @@ -214,7 +214,7 @@ func IsCloudCore() (types.ModuleRunning, error) { return types.NoneRunning, err } - if false != edgeCoreRunning { + if edgeCoreRunning { return types.KubeEdgeEdgeRunning, nil } diff --git a/tests/e2e/mapper/bluetooth/bluetooth_suite_test.go b/tests/e2e/mapper/bluetooth/bluetooth_suite_test.go index 4fcbed177..984037126 100644 --- a/tests/e2e/mapper/bluetooth/bluetooth_suite_test.go +++ b/tests/e2e/mapper/bluetooth/bluetooth_suite_test.go @@ -98,7 +98,7 @@ func TestMapperCharacteristics(t *testing.T) { req.Header.Set("Content-Type", "application/yaml") resp, err := client.Do(req) Expect(err).To(BeNil()) - utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) Expect(resp.StatusCode).Should(Equal(http.StatusCreated)) //Apply CRD for deviceinstance @@ -113,7 +113,7 @@ func TestMapperCharacteristics(t *testing.T) { req.Header.Set("Content-Type", "application/yaml") resp, err = client.Do(req) Expect(err).To(BeNil()) - utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) Expect(resp.StatusCode).Should(Equal(http.StatusCreated)) //Run ./cloudcore binary @@ -182,7 +182,7 @@ func TestMapperCharacteristics(t *testing.T) { resp, err = client.Do(req) Expect(err).To(BeNil()) Expect(resp.StatusCode).Should(Equal(http.StatusCreated)) - utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) //apply CRD for mock deviceinstance curPath = getpwd() @@ -197,7 +197,7 @@ func TestMapperCharacteristics(t *testing.T) { resp, err = client.Do(req) Expect(err).To(BeNil()) Expect(resp.StatusCode).Should(Equal(http.StatusCreated)) - utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) //updating deployment file with edgenode name and dockerhubusername curPath = getpwd() diff --git a/tests/e2e/utils/common.go b/tests/e2e/utils/common.go index a75654f3b..a1308bbb6 100644 --- a/tests/e2e/utils/common.go +++ b/tests/e2e/utils/common.go @@ -244,10 +244,10 @@ func newDeployment(cloudcore, edgecore bool, name, imgURL, nodeselector, configm var depObj *apps.DeploymentSpec var namespace string - if edgecore == true { + if edgecore { depObj = edgecoreDeploymentSpec(imgURL, configmap, replicas) namespace = Namespace - } else if cloudcore == true { + } else if cloudcore { depObj = cloudcoreDeploymentSpec(imgURL, configmap, replicas) namespace = Namespace } else { @@ -348,7 +348,7 @@ func HandlePod(operation string, apiserver string, UID string, pod *v1.Pod) bool Fatalf("HTTP request is failed :%v", err) return false } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) return true } @@ -393,7 +393,7 @@ func HandleDeployment(IsCloudCore, IsEdgeCore bool, operation, apiserver, UID, I Fatalf("HTTP request is failed :%v", err) return false } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) return true } @@ -447,16 +447,14 @@ func ExposeCloudService(name, serviceHandler string) error { Fatalf("HTTP request is failed :%v", err) return err } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) gomega.Expect(resp.StatusCode).Should(gomega.Equal(http.StatusCreated)) return nil } // CreateServiceObject function to create a servcice object func CreateServiceObject(name string) *v1.Service { - var portInfo []v1.ServicePort - - portInfo = []v1.ServicePort{ + portInfo := []v1.ServicePort{ { Name: "websocket", Protocol: "TCP", Port: 10000, TargetPort: intstr.FromInt(10000), }, { @@ -577,7 +575,7 @@ func HandleDeviceModel(operation string, apiserver string, UID string, protocolT Fatalf("HTTP request is failed :%v", err) return false, 0 } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) return true, resp.StatusCode } @@ -626,14 +624,14 @@ func HandleDeviceInstance(operation string, apiserver string, nodeSelector strin Fatalf("HTTP request is failed :%v", err) return false, 0 } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) return true, resp.StatusCode } // newDeviceInstanceObject creates a new device instance object func newDeviceInstanceObject(nodeSelector string, protocolType string, updated bool) *v1alpha1.Device { var deviceInstance v1alpha1.Device - if updated == false { + if !updated { switch protocolType { case "bluetooth": deviceInstance = NewBluetoothDeviceInstance(nodeSelector) @@ -662,7 +660,7 @@ func newDeviceInstanceObject(nodeSelector string, protocolType string, updated b // newDeviceModelObject creates a new device model object func newDeviceModelObject(protocolType string, updated bool) *v1alpha1.DeviceModel { var deviceModel v1alpha1.DeviceModel - if updated == false { + if !updated { switch protocolType { case "bluetooth": deviceModel = NewBluetoothDeviceModel() @@ -707,7 +705,9 @@ func GetDeviceModel(list *v1alpha1.DeviceModelList, getDeviceModelAPI string, ex for _, deviceModel := range list.Items { if expectedDeviceModel.ObjectMeta.Name == deviceModel.ObjectMeta.Name { modelExists = true - if reflect.DeepEqual(expectedDeviceModel.TypeMeta, deviceModel.TypeMeta) == false || expectedDeviceModel.ObjectMeta.Namespace != deviceModel.ObjectMeta.Namespace || reflect.DeepEqual(expectedDeviceModel.Spec, deviceModel.Spec) == false { + if !reflect.DeepEqual(expectedDeviceModel.TypeMeta, deviceModel.TypeMeta) || + expectedDeviceModel.ObjectMeta.Namespace != deviceModel.ObjectMeta.Namespace || + !reflect.DeepEqual(expectedDeviceModel.Spec, deviceModel.Spec) { return nil, errors.New("The device model is not matching with what was expected") } } @@ -738,7 +738,10 @@ func GetDevice(list *v1alpha1.DeviceList, getDeviceAPI string, expectedDevice *v for _, device := range list.Items { if expectedDevice.ObjectMeta.Name == device.ObjectMeta.Name { deviceExists = true - if reflect.DeepEqual(expectedDevice.TypeMeta, device.TypeMeta) == false || expectedDevice.ObjectMeta.Namespace != device.ObjectMeta.Namespace || reflect.DeepEqual(expectedDevice.ObjectMeta.Labels, device.ObjectMeta.Labels) == false || reflect.DeepEqual(expectedDevice.Spec, device.Spec) == false { + if !reflect.DeepEqual(expectedDevice.TypeMeta, device.TypeMeta) || + expectedDevice.ObjectMeta.Namespace != device.ObjectMeta.Namespace || + !reflect.DeepEqual(expectedDevice.ObjectMeta.Labels, device.ObjectMeta.Labels) || + !reflect.DeepEqual(expectedDevice.Spec, device.Spec) { return nil, errors.New("The device is not matching with what was expected") } twinExists := false @@ -746,7 +749,7 @@ func GetDevice(list *v1alpha1.DeviceList, getDeviceAPI string, expectedDevice *v for _, twin := range device.Status.Twins { if expectedTwin.PropertyName == twin.PropertyName { twinExists = true - if reflect.DeepEqual(expectedTwin.Desired, twin.Desired) == false { + if !reflect.DeepEqual(expectedTwin.Desired, twin.Desired) { return nil, errors.New("Status twin " + twin.PropertyName + " not as expected") } } @@ -847,7 +850,7 @@ func OnTwinMessageReceived(client MQTT.Client, message MQTT.Message) { // CompareConfigMaps is used to compare 2 config maps func CompareConfigMaps(configMap, expectedConfigMap v1.ConfigMap) bool { - if reflect.DeepEqual(expectedConfigMap.TypeMeta, configMap.TypeMeta) == false || expectedConfigMap.ObjectMeta.Namespace != configMap.ObjectMeta.Namespace || reflect.DeepEqual(expectedConfigMap.Data, configMap.Data) == false { + if !reflect.DeepEqual(expectedConfigMap.TypeMeta, configMap.TypeMeta) || expectedConfigMap.ObjectMeta.Namespace != configMap.ObjectMeta.Namespace || !reflect.DeepEqual(expectedConfigMap.Data, configMap.Data) { return false } return true diff --git a/tests/e2e/utils/context.go b/tests/e2e/utils/context.go index f457331d5..ed0eef9a3 100644 --- a/tests/e2e/utils/context.go +++ b/tests/e2e/utils/context.go @@ -62,7 +62,7 @@ func SendHTTPRequest(method, reqAPI string) (*http.Response, error) { Fatalf("HTTP request is failed :%v", err) return resp, err } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) return resp, nil } diff --git a/tests/e2e/utils/log.go b/tests/e2e/utils/log.go index 92ed9b888..d79508c2b 100644 --- a/tests/e2e/utils/log.go +++ b/tests/e2e/utils/log.go @@ -56,7 +56,7 @@ func PrintTestcaseNameandStatus() { var testdesc ginkgo.GinkgoTestDescription var Status string testdesc = ginkgo.CurrentGinkgoTestDescription() - if testdesc.Failed == true { + if testdesc.Failed { Status = "FAILED" } else { Status = "PASSED" diff --git a/tests/e2e/utils/node.go b/tests/e2e/utils/node.go index c050a23ba..ef184a6fa 100644 --- a/tests/e2e/utils/node.go +++ b/tests/e2e/utils/node.go @@ -103,7 +103,7 @@ func RegisterNodeToMaster(UID, nodehandler, nodeselector string) error { Fatalf("Sending HTTP request failed: %v", err) return err } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) defer resp.Body.Close() gomega.Expect(resp.StatusCode).Should(gomega.Equal(http.StatusCreated)) @@ -151,7 +151,7 @@ func HandleConfigmap(configName chan error, operation, confighandler string, IsE var req *http.Request var file string curpath := getpwd() - if IsEdgeCore == true { + if IsEdgeCore { file = path.Join(curpath, "../../performance/assets/02-edgeconfigmap.yaml") } else { file = path.Join(curpath, "../../performance/assets/01-configmap.yaml") @@ -188,7 +188,7 @@ func HandleConfigmap(configName chan error, operation, confighandler string, IsE if err != nil { Fatalf("Sending HTTP request failed: %v", err) } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) defer resp.Body.Close() if operation == http.MethodPost { gomega.Expect(resp.StatusCode).Should(gomega.Equal(http.StatusCreated)) @@ -227,7 +227,7 @@ func DeleteConfigmap(apiConfigMap string) int { func TaintEdgeDeployedNode(toTaint bool, taintHandler string) error { var temp map[string]interface{} var body string - if toTaint == true { + if toTaint { body = fmt.Sprintf(`{"spec":{"taints":[{"effect":"NoSchedule","key":"key","value":"value"}]}}`) } else { body = fmt.Sprintf(`{"spec":{"taints":null}}`) @@ -253,7 +253,7 @@ func TaintEdgeDeployedNode(toTaint bool, taintHandler string) error { Fatalf("Sending HTTP request failed: %v", err) return err } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) defer resp.Body.Close() gomega.Expect(resp.StatusCode).Should(gomega.Equal(http.StatusOK)) return nil @@ -281,8 +281,10 @@ func GetNodes(api string) v1.NodeList { } func ApplyLabelToNode(apiserver, key, val string) error { - var temp map[string]interface{} - var body string + var ( + temp map[string]interface{} + body string + ) body = fmt.Sprintf(`{"metadata":{"labels":{"%s":"%s"}}}`, key, val) err := json.Unmarshal([]byte(body), &temp) if err != nil { @@ -305,7 +307,7 @@ func ApplyLabelToNode(apiserver, key, val string) error { Fatalf("Sending HTTP request failed: %v", err) return err } - Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) defer resp.Body.Close() gomega.Expect(resp.StatusCode).Should(gomega.Equal(http.StatusOK)) return nil diff --git a/tests/performance/common/common.go b/tests/performance/common/common.go index 939fdf88b..1d8c56c2b 100644 --- a/tests/performance/common/common.go +++ b/tests/performance/common/common.go @@ -208,7 +208,7 @@ func ApplyLabel(nodeHandler string) error { break } } - if isMasterNode == false { + if !isMasterNode { utils.ApplyLabelToNode(nodeHandler+"/"+node.Name, NodelabelKey, NodelabelVal) } } @@ -314,7 +314,7 @@ func SendHTTPRequest(method, reqAPI string, body io.Reader) (*http.Response, err return resp, err } if resp != nil { - utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + utils.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) } return resp, nil } diff --git a/tests/stubs/cloud/controllerstub/podmanager.go b/tests/stubs/cloud/controllerstub/podmanager.go index eff682797..33888a020 100644 --- a/tests/stubs/cloud/controllerstub/podmanager.go +++ b/tests/stubs/cloud/controllerstub/podmanager.go @@ -147,10 +147,9 @@ func (pm *PodManager) PodHandlerFunc(w http.ResponseWriter, req *http.Request) { pm.AddPod(ns+"/"+p.Name, p) // Send msg - select { - case pm.event <- msg: - klog.V(4).Infof("Finish add pod request") - } + pm.event <- msg + klog.V(4).Infof("Finish add pod request") + case http.MethodDelete: // Delete Pod klog.V(4).Infof("Receive delete pod request") @@ -178,10 +177,8 @@ func (pm *PodManager) PodHandlerFunc(w http.ResponseWriter, req *http.Request) { pm.DeletePod(ns + "/" + name) // Send msg - select { - case pm.event <- msg: - klog.V(4).Infof("Finish delete pod request") - } + pm.event <- msg + klog.V(4).Infof("Finish delete pod request") default: klog.Errorf("Http type: %s unsupported", req.Method) diff --git a/tests/stubs/devices/mockserver.go b/tests/stubs/devices/mockserver.go index b889ac2f8..02cec8e8f 100644 --- a/tests/stubs/devices/mockserver.go +++ b/tests/stubs/devices/mockserver.go @@ -67,11 +67,9 @@ func main() { defer cancel() d.Init(createServiceAndAdvertise) - select { - case <-ctx.Done(): - klog.Info("Stopping server and cleaning up") - d.StopAdvertising() - d.RemoveAllServices() - klog.Info("Stopped advertising and removed all services!!!!") - } + <-ctx.Done() + klog.Info("Stopping server and cleaning up") + d.StopAdvertising() + d.RemoveAllServices() + klog.Info("Stopped advertising and removed all services!!!!") } diff --git a/tests/stubs/example/main.go b/tests/stubs/example/main.go index 0953d9f99..ee16351ee 100644 --- a/tests/stubs/example/main.go +++ b/tests/stubs/example/main.go @@ -137,7 +137,7 @@ func SendHTTPRequest(method, reqAPI string, body io.Reader) (*http.Response, err req.Header.Set("Content-Type", "application/json") t := time.Now() resp, err = client.Do(req) - klog.V(4).Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t)) + klog.V(4).Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t)) if err != nil { klog.Errorf("HTTP request is failed :%v", err) return resp, err |