@@ -46,7 +46,7 @@ import (
46
46
47
47
type EnvironmentService interface {
48
48
FindOne (environment string ) (* bean2.EnvironmentBean , error )
49
- GetDataSourceName (environment string ) (dataSourceData DataSourceMetaData , err error )
49
+ GetDataSourceName (environment string ) (dataSourceData bean2. DataSourceMetaData , err error )
50
50
Create (mappings * bean2.EnvironmentBean , userId int32 ) (* bean2.EnvironmentBean , error )
51
51
Update (mappings * bean2.EnvironmentBean , userId int32 ) (* bean2.EnvironmentBean , error )
52
52
GetAllActive () ([]bean2.EnvironmentBean , error )
@@ -106,8 +106,8 @@ func NewEnvironmentServiceImpl(environmentRepository repository.EnvironmentRepos
106
106
}
107
107
}
108
108
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 {}
111
111
model , err := impl .environmentRepository .FindOne (environment )
112
112
if err != nil {
113
113
impl .logger .Errorw ("error in fetching environment" , "err" , err )
@@ -128,11 +128,6 @@ func (impl EnvironmentServiceImpl) GetDataSourceName(environment string) (DataSo
128
128
}
129
129
}
130
130
131
- type DataSourceMetaData struct {
132
- Id int `json:"id"`
133
- Name string `json:"name"`
134
- }
135
-
136
131
func (impl EnvironmentServiceImpl ) Create (mappings * bean2.EnvironmentBean , userId int32 ) (* bean2.EnvironmentBean , error ) {
137
132
existingEnvs , err := impl .environmentRepository .FindByClusterId (mappings .ClusterId )
138
133
if err != nil && ! util .IsErrNoRows (err ) {
0 commit comments