Skip to content

Commit 0a48005

Browse files
naming
1 parent cf9b997 commit 0a48005

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

pkg/userResource/UserResourceExtendedService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (impl *UserResourceExtendedServiceImpl) GetResourceOptions(context context.
5656
impl.logger.Errorw("error in GetResourceOptions", "err", err, "reqBean", reqBean)
5757
return nil, err
5858
}
59-
f := getResourceOptionExtendedFunc(bean5.UserResourceKind(params.Kind), bean5.Version(params.Version))
59+
f := getAllResourceOptionsExtendedFunc(bean5.UserResourceKind(params.Kind), bean5.Version(params.Version))
6060
if f == nil {
6161
impl.logger.Errorw("error encountered in GetResourceOptions, not supported kind", "params", params)
6262
return nil, util.GetApiErrorAdapter(http.StatusBadRequest, "400", bean5.RequestInvalidKindVersionErrMessage, bean5.RequestInvalidKindVersionErrMessage)

pkg/userResource/UserResourceService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (impl *UserResourceServiceImpl) GetResourceOptions(context context.Context,
6666
return nil, err
6767
}
6868
// validation based on kind ,sub kind and entity and access type
69-
f := getResourceOptionFunc(bean5.UserResourceKind(params.Kind), bean5.Version(params.Version))
69+
f := getAllResourceOptionsFunc(bean5.UserResourceKind(params.Kind), bean5.Version(params.Version))
7070
if f == nil {
7171
impl.logger.Errorw("error encountered in GetResourceOptions, not supported kind", "params", params)
7272
return nil, util.GetApiErrorAdapter(http.StatusBadRequest, "400", bean5.RequestInvalidKindVersionErrMessage, bean5.RequestInvalidKindVersionErrMessage)

pkg/userResource/logicRouteService.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func getUserResourceKindWithVersionKey(kind bean.UserResourceKind, version bean.
1515
return fmt.Sprintf("%s_%s", kind, version)
1616
}
1717

18-
var mapOfUserResourceKindToResourceOptionFunc = map[string]func(impl *UserResourceServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error){
18+
var mapOfUserResourceKindToAllResourceOptionsFunc = map[string]func(impl *UserResourceServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error){
1919
getUserResourceKindWithVersionKey(bean.KindTeam, bean.Alpha1Version): (*UserResourceServiceImpl).getTeamResourceOptions,
2020
getUserResourceKindWithVersionKey(bean.KindHelmEnvironment, bean.Alpha1Version): (*UserResourceServiceImpl).getHelmEnvResourceOptions,
2121
getUserResourceKindWithVersionKey(bean.KindHelmApplication, bean.Alpha1Version): (*UserResourceServiceImpl).getHelmAppResourceOptions,
@@ -25,14 +25,14 @@ var mapOfUserResourceKindToResourceOptionFunc = map[string]func(impl *UserResour
2525
getUserResourceKindWithVersionKey(bean.ClusterResources, bean.Alpha1Version): (*UserResourceServiceImpl).getClusterResourceListOptions,
2626
}
2727

28-
func getResourceOptionFunc(kind bean.UserResourceKind, version bean.Version) func(impl *UserResourceServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error) {
29-
if f, ok := mapOfUserResourceKindToResourceOptionFunc[getUserResourceKindWithVersionKey(kind, version)]; ok {
28+
func getAllResourceOptionsFunc(kind bean.UserResourceKind, version bean.Version) func(impl *UserResourceServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error) {
29+
if f, ok := mapOfUserResourceKindToAllResourceOptionsFunc[getUserResourceKindWithVersionKey(kind, version)]; ok {
3030
return f
3131
}
3232
return nil
3333
}
3434

35-
var mapOfUserResourceKindToResourceOptionExtendedFunc = map[string]func(impl *UserResourceExtendedServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error){
35+
var mapOfUserResourceKindToAllResourceOptionsExtendedFunc = map[string]func(impl *UserResourceExtendedServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error){
3636
getUserResourceKindWithVersionKey(bean.KindTeam, bean.Alpha1Version): (*UserResourceExtendedServiceImpl).getTeamResourceOptions,
3737
getUserResourceKindWithVersionKey(bean.KindHelmEnvironment, bean.Alpha1Version): (*UserResourceExtendedServiceImpl).getHelmEnvResourceOptions,
3838
getUserResourceKindWithVersionKey(bean.KindHelmApplication, bean.Alpha1Version): (*UserResourceExtendedServiceImpl).getHelmAppResourceOptions,
@@ -47,8 +47,8 @@ var mapOfUserResourceKindToResourceOptionExtendedFunc = map[string]func(impl *Us
4747
getUserResourceKindWithVersionKey(bean.KindWorkflow, bean.Alpha1Version): (*UserResourceExtendedServiceImpl).getAppWfsResourceOptions,
4848
}
4949

50-
func getResourceOptionExtendedFunc(kind bean.UserResourceKind, version bean.Version) func(impl *UserResourceExtendedServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error) {
51-
if f, ok := mapOfUserResourceKindToResourceOptionExtendedFunc[getUserResourceKindWithVersionKey(kind, version)]; ok {
50+
func getAllResourceOptionsExtendedFunc(kind bean.UserResourceKind, version bean.Version) func(impl *UserResourceExtendedServiceImpl, context context.Context, token string, reqBean *apiBean.ResourceOptionsReqDto, params *apiBean.PathParams) (*bean.ResourceOptionsDto, error) {
51+
if f, ok := mapOfUserResourceKindToAllResourceOptionsExtendedFunc[getUserResourceKindWithVersionKey(kind, version)]; ok {
5252
return f
5353
}
5454
return nil

0 commit comments

Comments
 (0)