Skip to content

Commit 64ea301

Browse files
author
evelynwei
committed
refactor: fix golint
1 parent 355315d commit 64ea301

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

pkg/cache/config_cache.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ func (csm *CachedConfigFileMap) Delete(key string) {
4040
func (csm *CachedConfigFileMap) Load(key string) (value *v1.ConfigMap, ok bool) {
4141
v, ok := csm.sm.Load(key)
4242
if v != nil {
43-
value, ok2 := v.(*v1.ConfigMap)
43+
result, ok2 := v.(*v1.ConfigMap)
4444
if !ok2 {
4545
ok = false
4646
}
47-
return value, ok
47+
return result, ok
4848
}
4949
return value, ok
5050
}

pkg/cache/service_cache.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ func (csm *CachedServiceMap) Delete(key string) {
4040
func (csm *CachedServiceMap) Load(key string) (value *v1.Service, ok bool) {
4141
v, ok := csm.sm.Load(key)
4242
if v != nil {
43-
value, ok2 := v.(*v1.Service)
43+
result, ok2 := v.(*v1.Service)
4444
if !ok2 {
4545
ok = false
4646
}
47-
return value, ok
47+
return result, ok
4848
}
4949
return value, ok
5050
}

pkg/controller/endpoint.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func (p *PolarisController) processSyncInstance(service *v1.Service) (err error)
192192
fmt.Sprintf("%s Current polaris instance is %v", serviceMsg, currentIPs),
193193
fmt.Sprintf("%s addIns %v deleteIns %v updateIns %v", serviceMsg, addIns, deleteIns, updateIns),
194194
}
195-
log.SyncNamingScope().Infof(strings.Join(msg, "\n"))
195+
log.SyncNamingScope().Info(strings.Join(msg, "\n"))
196196

197197
var addInsErr, deleteInsErr, updateInsErr error
198198

pkg/polarisapi/config_api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func CreateConfigMap(configMap *v1.ConfigMap) (ConfigResponse, error) {
4646
if err != nil {
4747
return ConfigResponse{}, err
4848
}
49-
if err := releaseConfigMap(req); err != nil {
49+
if err = releaseConfigMap(req); err != nil {
5050
return ConfigResponse{}, err
5151
}
5252
return resp, err
@@ -62,7 +62,7 @@ func UpdateConfigMap(configMap *v1.ConfigMap) (ConfigResponse, error) {
6262
if err != nil {
6363
return ConfigResponse{}, err
6464
}
65-
if err := releaseConfigMap(req); err != nil {
65+
if err = releaseConfigMap(req); err != nil {
6666
return ConfigResponse{}, err
6767
}
6868
return resp, err

pkg/polarisapi/service_api.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ func CreateService(service *v1.Service) (CreateServicesResponse, error) {
539539
}
540540
if response.Code != ExistedResource {
541541
log.SyncNamingScope().Errorf("Failed to create service %s %v", serviceMsg, response.Info)
542-
return response, fmt.Errorf("create namespace failed: " + response.Info)
542+
return response, fmt.Errorf("create namespace failed: %s", response.Info)
543543
}
544544
}
545545

@@ -603,7 +603,7 @@ func CreateServiceAlias(service *v1.Service) (CreateServiceAliasResponse, error)
603603
}
604604
if response.Code != ExistedResource {
605605
log.SyncNamingScope().Errorf("Failed to create service alias %s %v", serviceAliasMsg, response.Info)
606-
return response, fmt.Errorf("create service alias failed: " + response.Info)
606+
return response, fmt.Errorf("create service alias failed: %s", response.Info)
607607
}
608608
}
609609

@@ -648,7 +648,7 @@ func UpdateService(service *v1.Service, request []Service) (int, PutServicesResp
648648
return statusCode, PutServicesResponse{}, err
649649
}
650650
log.SyncNamingScope().Errorf("Failed to update result %s %v", serviceMsg, response.Info)
651-
return statusCode, response, fmt.Errorf("Put service failed: " + response.Info)
651+
return statusCode, response, fmt.Errorf("Put service failed: %s ", response.Info)
652652
}
653653

654654
return statusCode, response, nil
@@ -697,7 +697,7 @@ func CreateNamespaces(namespace string) (CreateNamespacesResponse, error) {
697697
if response.Responses == nil || len(response.Responses) == 0 ||
698698
response.Responses[0].Code != ExistedResource {
699699
log.SyncNamingScope().Errorf("Failed to create namespace %s ,error response: %v", namespace, response)
700-
return response, fmt.Errorf("create namespace failed: " + response.Info)
700+
return response, fmt.Errorf("create namespace failed: %s", response.Info)
701701
}
702702
}
703703

0 commit comments

Comments
 (0)