diff --git a/cmd/climc/shell/monitor/commonalert.go b/cmd/climc/shell/monitor/commonalert.go index 27ff72cebd..c9167b95f7 100644 --- a/cmd/climc/shell/monitor/commonalert.go +++ b/cmd/climc/shell/monitor/commonalert.go @@ -77,9 +77,7 @@ func newCommonAlertQuery(tem *CommonAlertTerm) *monitorapi.CommonAlertQuery { mq.Selects = append(mq.Selects, selectPart) } if len(tem.Filters) != 0 { - for _, filter := range tem.Filters { - mq.Tags = append(mq.Tags, filter) - } + mq.Tags = append(mq.Tags, tem.Filters...) } alertQ := new(monitorapi.AlertQuery) diff --git a/pkg/cloudcommon/notifyclient/notify_internal.go b/pkg/cloudcommon/notifyclient/notify_internal.go index d1ab543263..d66249f73f 100644 --- a/pkg/cloudcommon/notifyclient/notify_internal.go +++ b/pkg/cloudcommon/notifyclient/notify_internal.go @@ -201,9 +201,7 @@ func genMsgViaLang(ctx context.Context, p sNotifyParams) ([]npk.SNotifyMessage, uidSet.Insert(id) } } - for _, uid := range uidSet.UnsortedList() { - reIds = append(reIds, uid) - } + reIds = append(reIds, uidSet.UnsortedList()...) } else { reIds = p.recipientId } diff --git a/pkg/cloudcommon/validators/errors.go b/pkg/cloudcommon/validators/errors.go index 3ccb4d7526..eaa07add1b 100644 --- a/pkg/cloudcommon/validators/errors.go +++ b/pkg/cloudcommon/validators/errors.go @@ -137,9 +137,7 @@ func newInvalidStructError(key string, err error) error { jsonClientErr, ok := err.(*httputils.JSONClientError) if ok { errFmt += httputils.MsgTmplToFmt(jsonClientErr.Data.Id) - for _, f := range jsonClientErr.Data.Fields { - params = append(params, f) - } + params = append(params, jsonClientErr.Data.Fields...) } return newError(ERR_INVALID_VALUE, errFmt, params...) } diff --git a/pkg/mcclient/modules/notify/mod_notification.go b/pkg/mcclient/modules/notify/mod_notification.go index ca48cdb52d..1dff6ae665 100644 --- a/pkg/mcclient/modules/notify/mod_notification.go +++ b/pkg/mcclient/modules/notify/mod_notification.go @@ -76,9 +76,7 @@ func (manager *NotificationManager) Send(s *mcclient.ClientSession, msg SNotifyM uidSet.Insert(id) } } - for _, uid := range uidSet.UnsortedList() { - receiverIds = append(receiverIds, uid) - } + receiverIds = append(receiverIds, uidSet.UnsortedList()...) } receiverIds = append(receiverIds, msg.Uid...) diff --git a/pkg/mcclient/options/k8s/fed_clusterrole.go b/pkg/mcclient/options/k8s/fed_clusterrole.go index 7929d33589..bef896578d 100644 --- a/pkg/mcclient/options/k8s/fed_clusterrole.go +++ b/pkg/mcclient/options/k8s/fed_clusterrole.go @@ -72,15 +72,9 @@ func parsePolicyRule(rule string) (*PolicyRule, error) { APIGroups: []string{}, Resources: []string{}, } - for _, group := range strings.Split(groupStr, ",") { - ret.APIGroups = append(ret.APIGroups, group) - } - for _, res := range strings.Split(resourceStr, ",") { - ret.Resources = append(ret.Resources, res) - } - for _, verb := range strings.Split(verbStr, ",") { - ret.Verbs = append(ret.Verbs, verb) - } + ret.APIGroups = append(ret.APIGroups, strings.Split(groupStr, ",")...) + ret.Resources = append(ret.Resources, strings.Split(resourceStr, ",")...) + ret.Verbs = append(ret.Verbs, strings.Split(verbStr, ",")...) return ret, nil } diff --git a/pkg/monitor/models/monitor_resource_sync.go b/pkg/monitor/models/monitor_resource_sync.go index 954243518c..e8d74807e3 100644 --- a/pkg/monitor/models/monitor_resource_sync.go +++ b/pkg/monitor/models/monitor_resource_sync.go @@ -348,9 +348,7 @@ func ListAllResources(manager modulebase.Manager, params *jsonutils.JSONDict) ([ if err != nil { return nil, errors.Wrapf(err, "list %s resources with params %s", manager.KeyString(), params.String()) } - for _, data := range result.Data { - objs = append(objs, data) - } + objs = append(objs, result.Data...) total := result.Total count = count + len(result.Data) if count >= total { diff --git a/pkg/webconsole/command/command.go b/pkg/webconsole/command/command.go index 2a70350b07..dea691bd66 100644 --- a/pkg/webconsole/command/command.go +++ b/pkg/webconsole/command/command.go @@ -56,9 +56,7 @@ func (c *BaseCommand) GetClientSession() *mcclient.ClientSession { } func (c *BaseCommand) AppendArgs(args ...string) *BaseCommand { - for _, arg := range args { - c.args = append(c.args, arg) - } + c.args = append(c.args, args...) return c }