[fix] fix golang-lint problem

apache · Jun 20, 2024 · 4f4f013 · 4f4f013
1 parent d56f44c
commit 4f4f013
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/datasource/etcd/ms.go b/datasource/etcd/ms.go
@@ -1861,39 +1861,39 @@ func (ds *MetadataManager) UpdateEnvironment(ctx context.Context, request *ev.Up
 }
 
 func (ds *MetadataManager) UnregisterEnvironment(ctx context.Context, request *ev.DeleteEnvironmentRequest) (err error) {
-	environmentId := request.EnvironmentId
+	environmentID := request.EnvironmentId
 	remoteIP := util.GetIPFromContext(ctx)
 	domainProject := util.ParseDomainProject(ctx)
 
-	environment, err := eutil.GetEnvironment(ctx, domainProject, environmentId)
+	environment, err := eutil.GetEnvironment(ctx, domainProject, environmentID)
 	if err != nil {
 		if errors.Is(err, datasource.ErrNoData) {
-			log.Debug(fmt.Sprintf("environment does not exist, del environmentId[%s] failed, operator: %s",
-				environmentId, remoteIP))
+			log.Debug(fmt.Sprintf("environment does not exist, del environmentID[%s] failed, operator: %s",
+				environmentID, remoteIP))
 			return pb.NewError(pb.ErrEnvironmentNotExists, "environment does not exist.")
 		}
 		log.Error(fmt.Sprintf("del environment[%s] failed, get environment file failed, operator: %s",
-			environmentId, remoteIP), err)
+			environmentID, remoteIP), err)
 		return pb.NewError(pb.ErrInternal, err.Error())
 	}
 
 	serviceEnvKey := path.GenerateServiceEnvIndexKey(domainProject, environment.ID)
 	if serviceUtil.ServiceEnvExist(ctx, serviceEnvKey) {
 		log.Error(fmt.Sprintf("del environment[%s] failed, get environment file failed, operator: %s",
-			environmentId, remoteIP), errors.New("this env has services"))
+			environmentID, remoteIP), errors.New("this env has services"))
 		return pb.NewError(pb.ErrUnregistryedEnv, "this env has services")
 	}
-	environmentIdKey := path.GenerateEnvironmentKey(domainProject, environmentId)
+	environmentIdKey := path.GenerateEnvironmentKey(domainProject, environmentID)
 	envKey := &ev.EnvironmentKey{
 		Tenant: domainProject,
 		Name:   environment.Name,
 	}
 	opts := []etcdadpt.OpOptions{
-		etcdadpt.OpDel(etcdadpt.WithStrKey(util.StringJoin([]string{path.GenerateEnvironmentIndexKey(envKey), environmentId}, "/"))),
+		etcdadpt.OpDel(etcdadpt.WithStrKey(util.StringJoin([]string{path.GenerateEnvironmentIndexKey(envKey), environmentID}, "/"))),
 		etcdadpt.OpDel(etcdadpt.WithStrKey(environmentIdKey)),
 	}
-	syncOpts, err := esync.GenDeleteOpts(ctx, datasource.ResourceEnvironment, environmentId,
-		&ev.DeleteEnvironmentRequest{EnvironmentId: environmentId})
+	syncOpts, err := esync.GenDeleteOpts(ctx, datasource.ResourceEnvironment, environmentID,
+		&ev.DeleteEnvironmentRequest{EnvironmentId: environmentID})
 	if err != nil {
 		log.Error("fail to sync opt", err)
 		return pb.NewError(pb.ErrInternal, err.Error())
@@ -1902,17 +1902,17 @@ func (ds *MetadataManager) UnregisterEnvironment(ctx context.Context, request *e
 
 	resp, err := etcdadpt.TxnWithCmp(ctx, opts, etcdadpt.If(etcdadpt.NotEqualVer(environmentIdKey, 0)), nil)
 	if err != nil {
-		log.Error(fmt.Sprintf("del environment[%s] failed, operator: %s", environmentId, remoteIP), err)
+		log.Error(fmt.Sprintf("del environment[%s] failed, operator: %s", environmentID, remoteIP), err)
 		return pb.NewError(pb.ErrUnavailableBackend, err.Error())
 	}
 	if !resp.Succeeded {
 		log.Error(fmt.Sprintf("del environment[%s] failed, environment does not exist, operator: %s",
-			environmentId, remoteIP), err)
-		return pb.NewError(pb.ErrEnvironmentNotExists, "environmentId does not exist.")
+			environmentID, remoteIP), err)
+		return pb.NewError(pb.ErrEnvironmentNotExists, "environmentID does not exist.")
 	}
 
 	quotasvc.RemandEnvironment(ctx)
 
-	log.Info(fmt.Sprintf("del environment[%s] successfully, operator: %s", environmentId, remoteIP))
+	log.Info(fmt.Sprintf("del environment[%s] successfully, operator: %s", environmentID, remoteIP))
 	return nil
 }
diff --git a/datasource/etcd/path/key_generator.go b/datasource/etcd/path/key_generator.go
@@ -387,10 +387,10 @@ func GenerateMetricsKey(name, utc, domain string) string {
 	}, SPLIT)
 }
 
-func GenerateEnvironmentKey(domainProject string, envId string) string {
+func GenerateEnvironmentKey(domainProject string, envID string) string {
 	return util.StringJoin([]string{
 		GetEnvironmentRootKey(domainProject),
-		envId,
+		envID,
 	}, SPLIT)
 }
 
@@ -418,9 +418,9 @@ func GetEnvironmentIndexRootKey(domainProject string) string {
 	}, SPLIT)
 }
 
-func GenerateServiceEnvIndexKey(domainProject string, envId string) string {
+func GenerateServiceEnvIndexKey(domainProject string, envID string) string {
 	return util.StringJoin([]string{
 		GetServiceIndexRootKey(domainProject),
-		envId,
+		envID,
 	}, SPLIT)
 }
diff --git a/datasource/mongo/ms.go b/datasource/mongo/ms.go
@@ -1683,23 +1683,23 @@ func (ds *MetadataManager) UpdateManyInstanceStatus(_ context.Context, _ *dataso
 	return nil
 }
 
-func (ds *MetadataManager) ListEnvironments(ctx context.Context) (*ev.GetEnvironmentsResponse, error) {
+func (ds *MetadataManager) ListEnvironments(_ context.Context) (*ev.GetEnvironmentsResponse, error) {
 	return nil, nil
 }
 
-func (ds *MetadataManager) RegisterEnvironment(ctx context.Context, request *ev.CreateEnvironmentRequest) (*ev.CreateEnvironmentResponse, error) {
+func (ds *MetadataManager) RegisterEnvironment(_ context.Context, _ *ev.CreateEnvironmentRequest) (*ev.CreateEnvironmentResponse, error) {
 	return nil, nil
 }
 
-func (ds *MetadataManager) GetEnvironment(ctx context.Context, request *ev.GetEnvironmentRequest) (
+func (ds *MetadataManager) GetEnvironment(_ context.Context, _ *ev.GetEnvironmentRequest) (
 	*ev.Environment, error) {
 	return nil, nil
 }
 
-func (ds *MetadataManager) UpdateEnvironment(ctx context.Context, request *ev.UpdateEnvironmentRequest) (err error) {
+func (ds *MetadataManager) UpdateEnvironment(_ context.Context, _ *ev.UpdateEnvironmentRequest) (err error) {
 	return nil
 }
 
-func (ds *MetadataManager) UnregisterEnvironment(ctx context.Context, request *ev.DeleteEnvironmentRequest) (err error) {
+func (ds *MetadataManager) UnregisterEnvironment(_ context.Context, _ *ev.DeleteEnvironmentRequest) (err error) {
 	return nil
 }
diff --git a/datasource/mongo/ops.go b/datasource/mongo/ops.go
@@ -75,6 +75,6 @@ func (ds *MetadataManager) getNotGlobalServiceFilter(ctx context.Context) (bson.
 	return util.NewFilter(util.NotIn(serviceIDs)), nil
 }
 
-func (ds *MetadataManager) CountEnvironment(ctx context.Context, request *ev.GetEnvironmentCountRequest) (*ev.GetEnvironmentCountResponse, error) {
+func (ds *MetadataManager) CountEnvironment(_ context.Context, _ *ev.GetEnvironmentCountRequest) (*ev.GetEnvironmentCountResponse, error) {
 	return nil, nil
 }
diff --git a/server/resource/disco/environment_resource.go b/server/resource/disco/environment_resource.go
@@ -77,7 +77,7 @@ func (s *EnvironmentResource) GetEnvironment(w http.ResponseWriter, r *http.Requ
 
 func (s *EnvironmentResource) UpdateEnvironment(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
-	environmentId := query.Get(":environmentId")
+	environmentID := query.Get(":environmentId")
 	message, err := io.ReadAll(r.Body)
 	if err != nil {
 		log.Error("read body failed", err)
@@ -91,7 +91,7 @@ func (s *EnvironmentResource) UpdateEnvironment(w http.ResponseWriter, r *http.R
 		rest.WriteError(w, pb.ErrInvalidParams, err.Error())
 		return
 	}
-	request.Environment.ID = environmentId
+	request.Environment.ID = environmentID
 	err = discosvc.UpdateEnvironment(r.Context(), &request)
 	if err != nil {
 		log.Error("update environment failed", err)
@@ -103,14 +103,14 @@ func (s *EnvironmentResource) UpdateEnvironment(w http.ResponseWriter, r *http.R
 
 func (s *EnvironmentResource) UnRegistryEnvironment(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
-	environmentId := query.Get(":environmentId")
+	environmentID := query.Get(":environmentId")
 
 	request := &ev.DeleteEnvironmentRequest{
-		EnvironmentId: environmentId,
+		EnvironmentId: environmentID,
 	}
 	err := discosvc.UnRegistryEnvironment(r.Context(), request)
 	if err != nil {
-		log.Error(fmt.Sprintf("delete environment[%s] failed", environmentId), err)
+		log.Error(fmt.Sprintf("delete environment[%s] failed", environmentID), err)
 		rest.WriteServiceError(w, err)
 		return
 	}