Skip to content

Commit f488451

Browse files
robocanicrobocanic
committed
fix: copilot cr problems
1 parent fc2a03a commit f488451

9 files changed

Lines changed: 45 additions & 30 deletions

File tree

‎pkg/console/handler/condition_rule.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func GetConditionRuleWithRuleName(cs consolectx.Context) gin.HandlerFunc {
6262
c.JSON(http.StatusBadRequest, model.NewErrorResp(fmt.Sprintf("ruleName must end with %s", consts.ConditionRuleSuffix)))
6363
return
6464
}
65-
if res, err := service.GetConditionRule(cs, mesh, name); err != nil {
65+
if res, err := service.GetConditionRule(cs, name, mesh); err != nil {
6666
c.JSON(http.StatusBadRequest, model.NewErrorResp(err.Error()))
6767
return
6868
} else {

‎pkg/console/handler/configurator_rule.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ func ConfiguratorSearch(ctx consolectx.Context) gin.HandlerFunc {
6565
}
6666
if err != nil {
6767
c.JSON(http.StatusInternalServerError, model.NewErrorResp(err.Error()))
68+
return
6869
}
6970
var respList []model.ConfiguratorSearchResp
7071
for _, res := range pageData.Data {

‎pkg/console/service/affinity_rule.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func CreateAffinityRule(ctx consolectx.Context, res *meshresource.AffinityRouteR
5555

5656
func DeleteAffinityRule(ctx consolectx.Context, name string, mesh string) error {
5757
if err := ctx.ResourceManager().DeleteByKey(
58-
meshresource.ConditionRouteKind,
58+
meshresource.AffinityRouteKind,
5959
coremodel.BuildResourceKey(mesh, name)); err != nil {
6060
return err
6161
}

‎pkg/console/service/tag_rule.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
package service
1919

2020
import (
21-
"github.com/apache/dubbo-admin/pkg/common/errors"
2221
consolectx "github.com/apache/dubbo-admin/pkg/console/context"
2322
"github.com/apache/dubbo-admin/pkg/core/logger"
24-
coreresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
23+
"github.com/apache/dubbo-admin/pkg/core/manager"
24+
meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
2525
coremodel "github.com/apache/dubbo-admin/pkg/core/resource/model"
2626
)
2727

28-
func GetTagRule(ctx consolectx.Context, name string, mesh string) (*coreresource.TagRouteResource, error) {
29-
r, _, err := ctx.ResourceManager().GetByKey(coreresource.TagRouteKind, coremodel.BuildResourceKey(mesh, name))
28+
func GetTagRule(ctx consolectx.Context, name string, mesh string) (*meshresource.TagRouteResource, error) {
29+
res, _, err := manager.GetByKey[*meshresource.TagRouteResource](
30+
ctx.ResourceManager(),
31+
meshresource.TagRouteKind,
32+
coremodel.BuildResourceKey(mesh, name),
33+
)
3034
if err != nil {
31-
logger.Warnf("get tag rule %s error: %v", name, err)
3235
return nil, err
3336
}
34-
if r, ok := r.(*coreresource.TagRouteResource); ok {
35-
return r, nil
36-
}
37-
return nil, errors.NewAssertionError(string(coreresource.TagRouteKind), string(r.ResourceKind()))
37+
return res, nil
3838
}
3939

40-
func UpdateTagRule(ctx consolectx.Context, res *coreresource.TagRouteResource) error {
40+
func UpdateTagRule(ctx consolectx.Context, res *meshresource.TagRouteResource) error {
4141
err := ctx.ResourceManager().Update(res)
4242
if err != nil {
4343
logger.Warnf("update tag rule %s error: %v", res.Name, err)
@@ -46,7 +46,7 @@ func UpdateTagRule(ctx consolectx.Context, res *coreresource.TagRouteResource) e
4646
return nil
4747
}
4848

49-
func CreateTagRule(ctx consolectx.Context, res *coreresource.TagRouteResource) error {
49+
func CreateTagRule(ctx consolectx.Context, res *meshresource.TagRouteResource) error {
5050
err := ctx.ResourceManager().Add(res)
5151
if err != nil {
5252
logger.Warnf("create tag rule %s error: %v", res.Name, err)
@@ -56,7 +56,7 @@ func CreateTagRule(ctx consolectx.Context, res *coreresource.TagRouteResource) e
5656
}
5757

5858
func DeleteTagRule(ctx consolectx.Context, name string, mesh string) error {
59-
err := ctx.ResourceManager().DeleteByKey(coreresource.TagRouteKind, coremodel.BuildResourceKey(mesh, name))
59+
err := ctx.ResourceManager().DeleteByKey(meshresource.TagRouteKind, coremodel.BuildResourceKey(mesh, name))
6060
if err != nil {
6161
logger.Warnf("delete tag rule %s error: %v", name, err)
6262
return err

‎pkg/core/manager/manager_helper.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package manager
1919

2020
import (
21+
"reflect"
22+
2123
"github.com/apache/dubbo-admin/pkg/common/errors"
2224
"github.com/apache/dubbo-admin/pkg/core/resource/model"
2325
)
@@ -33,7 +35,7 @@ func GetByKey[T model.Resource](rm ReadOnlyResourceManager, rk model.ResourceKin
3335
typedResource, ok := resource.(T)
3436
if !ok {
3537
var zero T
36-
return zero, false, errors.NewAssertionError(rk, typedResource.ResourceKind())
38+
return zero, false, errors.NewAssertionError(rk, reflect.TypeOf(typedResource).Name())
3739
}
3840
return typedResource, true, nil
3941
}
@@ -49,7 +51,7 @@ func ListByIndexes[T model.Resource](rm ReadOnlyResourceManager, rk model.Resour
4951
for i, resource := range resources {
5052
typedResource, ok := resource.(T)
5153
if !ok {
52-
return nil, errors.NewAssertionError(rk, typedResource.ResourceKind())
54+
return nil, errors.NewAssertionError(rk, reflect.TypeOf(typedResource).Name())
5355
}
5456
typedResources[i] = typedResource
5557
}
@@ -73,7 +75,7 @@ func PageListByIndexes[T model.Resource](
7375
for i, resource := range pageData.Data {
7476
typedResource, ok := resource.(T)
7577
if !ok {
76-
return nil, errors.NewAssertionError(rk, typedResource.ResourceKind())
78+
return nil, errors.NewAssertionError(rk, reflect.TypeOf(typedResource).Name())
7779
}
7880
typedResources[i] = typedResource
7981
}
@@ -103,7 +105,7 @@ func PageSearchResourceByConditions[T model.Resource](
103105
for i, resource := range pageData.Data {
104106
typedResource, ok := resource.(T)
105107
if !ok {
106-
return nil, errors.NewAssertionError(rk, typedResource.ResourceKind())
108+
return nil, errors.NewAssertionError(rk, reflect.TypeOf(typedResource).Name())
107109
}
108110
typedResources[i] = typedResource
109111
}

‎pkg/core/store/index/common.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package index
1919

2020
import (
21+
"reflect"
22+
2123
"github.com/apache/dubbo-admin/pkg/common/errors"
2224
coremodel "github.com/apache/dubbo-admin/pkg/core/resource/model"
2325
"github.com/duke-git/lancet/v2/slice"
@@ -38,7 +40,7 @@ func init() {
3840
func ByMesh(obj interface{}) ([]string, error) {
3941
r, ok := obj.(coremodel.Resource)
4042
if !ok {
41-
return nil, errors.NewAssertionError("Resource", obj)
43+
return nil, errors.NewAssertionError("Resource", reflect.TypeOf(obj).Name())
4244
}
4345
return []string{r.MeshName()}, nil
4446
}

‎pkg/core/store/index/instance.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package index
1919

2020
import (
21+
"reflect"
22+
2123
"github.com/apache/dubbo-admin/pkg/common/errors"
2224
meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
2325
"k8s.io/client-go/tools/cache"
@@ -36,9 +38,9 @@ func init() {
3638
}
3739

3840
func byInstanceAppName(obj interface{}) ([]string, error) {
39-
instance, ok := obj.(meshresource.InstanceResource)
41+
instance, ok := obj.(*meshresource.InstanceResource)
4042
if !ok {
41-
return nil, errors.NewAssertionError(string(meshresource.InstanceKind), string(instance.ResourceKind()))
43+
return nil, errors.NewAssertionError(meshresource.InstanceKind, reflect.TypeOf(obj).Name())
4244
}
4345
if instance.Spec == nil {
4446
return []string{}, nil
@@ -47,9 +49,9 @@ func byInstanceAppName(obj interface{}) ([]string, error) {
4749
}
4850

4951
func byIp(obj interface{}) ([]string, error) {
50-
instance, ok := obj.(meshresource.InstanceResource)
52+
instance, ok := obj.(*meshresource.InstanceResource)
5153
if !ok {
52-
return nil, errors.NewAssertionError(string(meshresource.InstanceKind), string(instance.ResourceKind()))
54+
return nil, errors.NewAssertionError(meshresource.InstanceKind, reflect.TypeOf(obj).Name())
5355
}
5456
if instance.Spec == nil {
5557
return []string{}, nil

‎pkg/core/store/index/service_consumer_metadata.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
package index
1919

2020
import (
21+
"reflect"
22+
23+
"github.com/apache/dubbo-admin/pkg/common/errors"
2124
meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
2225
"k8s.io/client-go/tools/cache"
2326
)
@@ -28,14 +31,17 @@ const (
2831

2932
func init() {
3033
RegisterIndexers(meshresource.ServiceConsumerMetadataKind, map[string]cache.IndexFunc{
31-
ByServiceProviderAppName: byServiceConsumerAppName,
34+
ByServiceConsumerAppName: byServiceConsumerAppName,
3235
})
3336
}
3437

3538
func byServiceConsumerAppName(obj interface{}) ([]string, error) {
36-
serviceConsumerMetadata, ok := obj.(*meshresource.ServiceConsumerMetadataResource)
39+
metadata, ok := obj.(*meshresource.ServiceConsumerMetadataResource)
3740
if !ok {
41+
return nil, errors.NewAssertionError(meshresource.ServiceConsumerMetadataKind, reflect.TypeOf(obj).Name())
42+
}
43+
if metadata == nil {
3844
return []string{}, nil
3945
}
40-
return []string{serviceConsumerMetadata.Spec.ConsumerAppName}, nil
46+
return []string{metadata.Spec.ConsumerAppName}, nil
4147
}

‎pkg/core/store/index/service_provider_metadata.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package index
1919

2020
import (
21+
"reflect"
22+
2123
"github.com/apache/dubbo-admin/pkg/common/errors"
2224
meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
2325
"k8s.io/client-go/tools/cache"
@@ -34,12 +36,12 @@ func init() {
3436
}
3537

3638
func byServiceProviderAppName(obj interface{}) ([]string, error) {
37-
instance, ok := obj.(meshresource.ServiceProviderMetadataResource)
39+
metadata, ok := obj.(*meshresource.ServiceProviderMetadataResource)
3840
if !ok {
39-
return nil, errors.NewAssertionError(meshresource.ServiceProviderMetadataKind, obj)
41+
return nil, errors.NewAssertionError(meshresource.ServiceProviderMetadataKind, reflect.TypeOf(obj))
4042
}
41-
if instance.Spec == nil {
43+
if metadata.Spec == nil {
4244
return []string{}, nil
4345
}
44-
return []string{instance.Spec.ProviderAppName}, nil
46+
return []string{metadata.Spec.ProviderAppName}, nil
4547
}

0 commit comments

Comments
 (0)