Skip to content

Commit 6b4b748

Browse files
committed
fix: get data Source API
1 parent 44c739c commit 6b4b748

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkg/cluster/environment/EnvironmentService.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646

4747
type EnvironmentService interface {
4848
FindOne(environment string) (*bean2.EnvironmentBean, error)
49-
GetDataSourceName(environment string) (dataSourceData DataSourceMetaData, err error)
49+
GetDataSourceName(environment string) (dataSourceData bean2.DataSourceMetaData, err error)
5050
Create(mappings *bean2.EnvironmentBean, userId int32) (*bean2.EnvironmentBean, error)
5151
Update(mappings *bean2.EnvironmentBean, userId int32) (*bean2.EnvironmentBean, error)
5252
GetAllActive() ([]bean2.EnvironmentBean, error)
@@ -106,8 +106,8 @@ func NewEnvironmentServiceImpl(environmentRepository repository.EnvironmentRepos
106106
}
107107
}
108108

109-
func (impl EnvironmentServiceImpl) GetDataSourceName(environment string) (DataSourceMetaData, error) {
110-
datasource := DataSourceMetaData{}
109+
func (impl EnvironmentServiceImpl) GetDataSourceName(environment string) (bean2.DataSourceMetaData, error) {
110+
datasource := bean2.DataSourceMetaData{}
111111
model, err := impl.environmentRepository.FindOne(environment)
112112
if err != nil {
113113
impl.logger.Errorw("error in fetching environment", "err", err)
@@ -128,11 +128,6 @@ func (impl EnvironmentServiceImpl) GetDataSourceName(environment string) (DataSo
128128
}
129129
}
130130

131-
type DataSourceMetaData struct {
132-
Id int `json:"id"`
133-
Name string `json:"name"`
134-
}
135-
136131
func (impl EnvironmentServiceImpl) Create(mappings *bean2.EnvironmentBean, userId int32) (*bean2.EnvironmentBean, error) {
137132
existingEnvs, err := impl.environmentRepository.FindByClusterId(mappings.ClusterId)
138133
if err != nil && !util.IsErrNoRows(err) {

pkg/cluster/environment/bean/bean.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,8 @@ const (
6666
PIPELINE_DEPLOYMENT_TYPE_HELM = "helm"
6767
PIPELINE_DEPLOYMENT_TYPE_ACD = "argo_cd"
6868
)
69+
70+
type DataSourceMetaData struct {
71+
Id int `json:"id"`
72+
Name string `json:"name"`
73+
}

0 commit comments

Comments
 (0)