Copilot commented on code in PR #1353:
URL: https://github.com/apache/dubbo-admin/pull/1353#discussion_r2507675472
##########
pkg/console/handler/application.go:
##########
@@ -88,231 +85,91 @@ func ApplicationSearch(ctx consolectx.Context)
gin.HandlerFunc {
return func(c *gin.Context) {
req := model.NewApplicationSearchReq()
if err := c.ShouldBindQuery(req); err != nil {
- c.JSON(http.StatusBadRequest,
model.NewErrorResp(err.Error()))
+ util.HandleArgumentError(c, err)
return
}
resp, err := service.SearchApplications(ctx, req)
if err != nil {
- c.JSON(http.StatusBadRequest,
model.NewErrorResp(err.Error()))
+ util.HandleServiceError(c, err)
return
}
c.JSON(http.StatusOK, model.NewSuccessResp(resp))
}
}
-func isAppOperatorLogOpened(conf *meshproto.OverrideConfig, appName string)
bool {
- if conf.Side != consts.SideProvider ||
- conf.Parameters == nil ||
- conf.Match == nil ||
- conf.Match.Application == nil ||
- conf.Match.Application.Oneof == nil ||
- len(conf.Match.Application.Oneof) != 1 ||
- conf.Match.Application.Oneof[0].Exact != appName {
- return false
- } else if val, ok := conf.Parameters[`accesslog`]; !ok || val != `true`
{
- return false
- }
- return true
-}
-
-func ApplicationConfigOperatorLogPut(ctx consolectx.Context) gin.HandlerFunc {
+func ApplicationConfigAccessLogPut(ctx consolectx.Context) gin.HandlerFunc {
return func(c *gin.Context) {
var (
appName string
operatorLogOpen bool
- isNotExist = false
mesh string
Review Comment:
Pre-declaring these variables with zero values and then assigning them is
unnecessary. Consider removing the pre-declaration and directly assigning
values when querying, e.g., `appName := c.Query(\"appName\")`. This pattern is
used correctly in other functions like `ApplicationConfigAccessLogGet` at line
133.
##########
pkg/console/handler/mesh.go:
##########
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package handler
+
+import (
+ "net/http"
+
+ "github.com/duke-git/lancet/v2/slice"
+ "github.com/gin-gonic/gin"
+
+ discoverycfg "github.com/apache/dubbo-admin/pkg/config/discovery"
+ consolectx "github.com/apache/dubbo-admin/pkg/console/context"
+ "github.com/apache/dubbo-admin/pkg/console/model"
+)
+
+// ListMeshes list all meshes(discoveries) defined in config
+func ListMeshes(ctx consolectx.Context) gin.HandlerFunc {
+ return func(c *gin.Context) {
+ discoveries := ctx.Config().Discovery
+ meshes := slice.Map(discoveries, func(index int, item
*discoverycfg.Config) model.MeshResp {
+ return model.MeshResp{
+ Name: item.Name,
+ Type: string(item.Type),
+ }
+ })
+ c.JSON(http.StatusOK, model.NewSuccessResp(meshes))
+ return
Review Comment:
[nitpick] The `return` statement is unnecessary here as it's the last
statement in the function. It can be safely removed.
```suggestion
```
##########
pkg/console/service/application.go:
##########
@@ -267,3 +273,402 @@ func buildApplicationSearchResp(appResource
*meshresource.ApplicationResource, m
RegistryClusters: []string{mesh},
}
}
+
+func isAppAccessLogConfig(conf *meshproto.OverrideConfig, appName string) bool
{
+ if conf.Side != consts.SideProvider ||
+ conf.Parameters == nil ||
+ conf.Match == nil ||
+ conf.Match.Application == nil ||
+ conf.Match.Application.Oneof == nil ||
+ len(conf.Match.Application.Oneof) != 1 ||
+ conf.Match.Application.Oneof[0].Exact != appName {
+ return false
+ }
+ if _, ok := conf.Parameters[`accesslog`]; !ok {
+ return false
+ }
+ return true
+}
+
+func UpInsertAppAccessLog(ctx consolectx.Context, appName string,
openAccessLog bool, mesh string) error {
+ // check app exists
+ data, err := GetApplicationDetail(ctx,
&model.ApplicationDetailReq{AppName: appName})
+ if err != nil {
+ return err
+ }
+ if data == nil {
+ return bizerror.NewBizError(bizerror.AppNotFound,
fmt.Sprintf("%s does not exist", appName))
+ }
+ // check app configurator exists
+ appConfiguratorName := appName + consts.ConfiguratorRuleSuffix
+ res, err := GetConfigurator(ctx, appConfiguratorName, mesh)
+ if err != nil {
+ return err
+ }
+ // if not exists, create one configurator with access log enable
+ if res == nil {
+ return insertConfiguratorWithAccessLog(ctx, res, openAccessLog,
appConfiguratorName, appName, mesh)
+ }
+ // else we update the configurator
+ return updateConfiguratorWithAccessLog(ctx, res, openAccessLog,
appConfiguratorName, appName, mesh)
+}
+
+func insertConfiguratorWithAccessLog(ctx consolectx.Context, res
*meshresource.DynamicConfigResource, openAccessLog bool,
+ appConfiguratorName, appName, mesh string) error {
+ // configurator is nil, accessLog is already closed
+ if !openAccessLog {
+ return nil
+ }
+ res =
meshresource.NewDynamicConfigResourceWithAttributes(appConfiguratorName, mesh)
+ res.Spec = &meshproto.DynamicConfig{
+ Key: appName,
+ Scope: consts.ScopeApplication,
+ ConfigVersion: consts.ConfiguratorVersionV3,
+ Enabled: true,
+ Configs: make([]*meshproto.OverrideConfig, 0),
+ }
+ res.Spec.Configs = append(res.Spec.Configs,
newAccessLogEnabledConfig(appName))
+ err := CreateConfigurator(ctx, appConfiguratorName, res)
+ if err != nil {
+ logger.Errorf("create configurator failed when open accesslog,
resourceKey: %s, openAccessLog: %t, err: %s",
+ coremodel.BuildResourceKey(mesh, appName),
openAccessLog, err)
+ return err
+ }
+ return nil
+}
+
+func updateConfiguratorWithAccessLog(ctx consolectx.Context, res
*meshresource.DynamicConfigResource, openAccessLog bool,
+ appConfiguratorName, appName, mesh string) error {
+ var accessLogConfig *meshproto.OverrideConfig
+ res.Spec.RangeConfig(func(conf *meshproto.OverrideConfig) (isStop bool)
{
+ if isAppAccessLogConfig(conf, appName) {
+ accessLogConfig = conf
+ return true
+ }
+ return false
+ })
+ // access log config not found
+ if accessLogConfig == nil {
+ // access log needs to be closed and already closed
+ if !openAccessLog {
+ return nil
+ }
+ // insert a access log enabled config
+ res.Spec.Configs = append(res.Spec.Configs,
newAccessLogEnabledConfig(appName))
+ } else {
+ // access log config found and status is the same as needed
+ if accessLogConfig.Enabled == openAccessLog {
+ return nil
+ }
+ // update the access log enabled status as needed
+ accessLogConfig.Enabled = openAccessLog
+ }
+ err := UpdateConfigurator(ctx, appConfiguratorName, res)
+ if err != nil {
+ logger.Errorf("update configurator failed when opening
accesslog, resourceKey: %s, openAccessLog: %t, err: %s",
+ coremodel.BuildResourceKey(mesh, appName),
openAccessLog, err)
+ return err
+ }
+ return nil
+}
+
+func newAccessLogEnabledConfig(appName string) *meshproto.OverrideConfig {
+ return &meshproto.OverrideConfig{
+ Side: consts.SideProvider,
+ Parameters: map[string]string{`accesslog`: `true`},
+ Enabled: true,
+ Match: &meshproto.ConditionMatch{
+ Application: &meshproto.ListStringMatch{
+ Oneof: []*meshproto.StringMatch{
+ {
+ Exact: appName,
+ },
+ }}},
+ XGenerateByCp: true,
+ }
+}
+
+func GetAppAccessLog(ctx consolectx.Context, appName string, mesh string)
(*model.AppAccessLogConfigResp, error) {
+ appConfiguratorName := appName + consts.ConfiguratorRuleSuffix
+ res, err := GetConfigurator(ctx, appConfiguratorName, mesh)
+ resp := &model.AppAccessLogConfigResp{
+ AccessLog: false,
+ }
+ if err != nil {
+ logger.Errorf("get configurator failed when get app accesslog,
resourceKey: %s, err: %s",
+ coremodel.BuildResourceKey(mesh, appName), err)
+ return nil, err
+ }
+ if res == nil {
+ return resp, nil
+ }
+ var appAccessLogConfig *meshproto.OverrideConfig
+ res.Spec.RangeConfig(func(conf *meshproto.OverrideConfig) (isStop bool)
{
+ if isAppAccessLogConfig(conf, appName) {
+ appAccessLogConfig = conf
+ return true
+ }
+ return false
+ })
+ if appAccessLogConfig == nil {
+ return resp, nil
+ }
+ resp.AccessLog = appAccessLogConfig.Enabled
+ return resp, nil
+}
+
+func GetAppFlowWeight(ctx consolectx.Context, appName string, mesh string)
(*model.AppFlowWeightConfigResp, error) {
+ resp := &model.AppFlowWeightConfigResp{
+ FlowWeightSets: []model.FlowWeightSet{},
+ }
+ appConfiguratorName := appName + consts.ConfiguratorRuleSuffix
+ res, err := GetConfigurator(ctx, appConfiguratorName, mesh)
+ if err != nil {
+ logger.Errorf("get configurator failed when get app flow
weight, resourceKey: %s, err: %s",
+ coremodel.BuildResourceKey(mesh, appName), err)
+ return nil, err
+ }
+ if res == nil {
+ return resp, nil
+ }
+
+ weight := 0
+ res.Spec.RangeConfig(func(conf *meshproto.OverrideConfig) (isStop bool)
{
+ if isFlowWeightConfig(conf) {
+ weight, err = strconv.Atoi(conf.Parameters[`weight`])
+ if err != nil {
+ logger.Error("parse weight failed", err)
+ return true
+ }
+ scope := make([]model.ParamMatch, 0,
len(conf.Match.Param))
+ for _, param := range conf.Match.Param {
+ scope = append(scope, model.ParamMatch{
+ Key: ¶m.Key,
+ Value:
model.StringMatchToModelStringMatch(param.Value),
+ })
+ }
+
+ resp.FlowWeightSets = append(resp.FlowWeightSets,
model.FlowWeightSet{
+ Weight: int32(weight),
+ Scope: scope,
+ })
+ }
+ return false
+ })
+ return resp, nil
+}
+
+func isFlowWeightConfig(conf *meshproto.OverrideConfig) bool {
+ if conf.Side != consts.SideProvider ||
+ conf.Parameters == nil ||
+ conf.Match == nil ||
+ conf.Match.Param == nil {
+ return false
+ }
+ if _, ok := conf.Parameters[`weight`]; !ok {
+ return false
+ }
+ return true
+}
+
+func UpInsertAppFlowWeightConfig(ctx consolectx.Context, appName string, mesh
string, flowWeightSets []model.FlowWeightSet) error {
+ // check app exists
+ data, err := GetApplicationDetail(ctx,
&model.ApplicationDetailReq{AppName: appName})
+ if err != nil {
+ return err
+ }
+ if data == nil {
+ return bizerror.NewBizError(bizerror.AppNotFound,
fmt.Sprintf("%s does not exist", appName))
+ }
+ appConfiguratorName := appName + consts.ConfiguratorRuleSuffix
+ res, err := GetConfigurator(ctx, appConfiguratorName, mesh)
+ if err != nil {
+ logger.Errorf("get configurator failed when update app flow
weight, resourceKey: %s, err: %s",
+ coremodel.BuildResourceKey(mesh, appName), err)
+ return err
+ }
+ // configurator not exists, insert a new one
+ if res == nil {
+ return insertConfiguratorWithFlowWeight(ctx, flowWeightSets,
appName, appConfiguratorName, mesh)
+ }
+ // configurator exists, update it
+
+ // remove old flow weight config
+ res.Spec.RangeConfigsToRemove(func(conf *meshproto.OverrideConfig)
(IsRemove bool) {
+ return isFlowWeightConfig(conf)
+ })
+
+ // add new flow weight config
+ flowWeightConfigs := slice.Map(flowWeightSets, func(index int, set
model.FlowWeightSet) *meshproto.OverrideConfig {
+ return fromFlowWeightSet(set)
+ })
+ res.Spec.Configs = slice.Union(res.Spec.Configs, flowWeightConfigs)
+
+ err = UpdateConfigurator(ctx, appConfiguratorName, res)
+ if err != nil {
+ logger.Errorf("update configurator failed with app flow weight,
resourceKey: %s, err: %s",
+ coremodel.BuildResourceKey(mesh, appName), err)
+ return err
+ }
+ return nil
+}
+
+func insertConfiguratorWithFlowWeight(
+ ctx consolectx.Context,
+ flowWeightSets []model.FlowWeightSet,
+ appName, appConfiguratorName, mesh string) error {
+ res :=
meshresource.NewDynamicConfigResourceWithAttributes(appConfiguratorName, mesh)
+ res.Spec = &meshproto.DynamicConfig{
+ Key: appName,
+ Scope: consts.ScopeApplication,
+ ConfigVersion: consts.ConfiguratorVersionV3,
+ Enabled: true,
+ }
+ flowWeightConfigs := slice.Map(flowWeightSets, func(index int, set
model.FlowWeightSet) *meshproto.OverrideConfig {
+ return fromFlowWeightSet(set)
+ })
+ res.Spec.Configs = flowWeightConfigs
+ err := CreateConfigurator(ctx, appConfiguratorName, res)
+ if err != nil {
+ logger.Errorf("insert configurator failed with app flow weight,
resourceKey: %s, err: %s",
+ coremodel.BuildResourceKey(mesh, appName), err)
+ return err
+ }
+ return nil
+}
+
+func fromFlowWeightSet(set model.FlowWeightSet) *meshproto.OverrideConfig {
+ paramMatch := make([]*meshproto.ParamMatch, 0, len(set.Scope))
+ for _, match := range set.Scope {
+ paramMatch = append(paramMatch, &meshproto.ParamMatch{
+ Key: *match.Key,
+ Value: model.ModelStringMatchToStringMatch(match.Value),
+ })
+ }
+ return &meshproto.OverrideConfig{
+ Side: consts.SideProvider,
+ Parameters: map[string]string{`weight`:
strconv.Itoa(int(set.Weight))},
+ Match: &meshproto.ConditionMatch{
+ Param: paramMatch,
+ },
+ XGenerateByCp: true,
+ }
+}
+func GetGrayConfig(ctx consolectx.Context, appName string, mesh string)
(*model.AppGrayConfigResp, error) {
+ resp := &model.AppGrayConfigResp{}
+ serviceTagRuleName := appName + consts.TagRuleSuffix
+ res, err := GetTagRule(ctx, serviceTagRuleName, mesh)
+ if err != nil {
+ logger.Errorf("get tag rule failed when get gray config,
resourceKey: %s, err: %s",
+ coremodel.BuildResourceKey(mesh, appName), err)
+ return nil, err
+ }
Review Comment:
Potential nil pointer dereference. If `res` is nil (which can happen based
on line 565 where it's returned from `GetTagRule`), accessing `res.Spec.Tags`
will panic. The nil check should be performed before accessing `res.Spec`.
```suggestion
}
if res == nil || res.Spec == nil {
logger.Errorf("tag rule resource or spec is nil when get gray
config, resourceKey: %s", coremodel.BuildResourceKey(mesh, appName))
return nil, fmt.Errorf("tag rule resource or spec is nil for
app %s in mesh %s", appName, mesh)
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
