Skip to content

Commit a7ff550

Browse files
prakash100198prakash100198
committed
removed unwanted code
1 parent 2c98ca1 commit a7ff550

File tree

2 files changed

+13
-154
lines changed

2 files changed

+13
-154
lines changed

‎pkg/pipeline/draftAwareConfigService/DraftAwareConfigService.go

Lines changed: 13 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,7 @@ func (impl *DraftAwareConfigServiceImpl) CMGlobalAddUpdate(ctx context.Context,
7777
impl.logger.Errorw("error in CMGlobalAddUpdate", "configMapRequest", configMapRequest, "err", err)
7878
return nil, err
7979
}
80-
var resourceName string
81-
if len(configMapRequest.ConfigData) > 0 && configMapRequest.ConfigData[0] != nil {
82-
resourceName = configMapRequest.ConfigData[0].Name
83-
}
84-
configProperty := &bean.ConfigNameAndType{
85-
Name: resourceName,
86-
Type: bean.CM,
87-
}
88-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, configMapRequest, isSuperAdmin, userEmail)
89-
if err != nil {
90-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
91-
return nil, err
92-
}
80+
9381
return resp, nil
9482
}
9583

@@ -99,19 +87,7 @@ func (impl *DraftAwareConfigServiceImpl) CMEnvironmentAddUpdate(ctx context.Cont
9987
impl.logger.Errorw("error in CMEnvironmentAddUpdate", "configMapRequest", configMapRequest, "err", err)
10088
return nil, err
10189
}
102-
var resourceName string
103-
if len(configMapRequest.ConfigData) > 0 && configMapRequest.ConfigData[0] != nil {
104-
resourceName = configMapRequest.ConfigData[0].Name
105-
}
106-
configProperty := &bean.ConfigNameAndType{
107-
Name: resourceName,
108-
Type: bean.CM,
109-
}
110-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, configMapRequest, isSuperAdmin, userEmail)
111-
if err != nil {
112-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
113-
return nil, err
114-
}
90+
11591
return resp, nil
11692
}
11793

@@ -121,19 +97,7 @@ func (impl *DraftAwareConfigServiceImpl) CSGlobalAddUpdate(ctx context.Context,
12197
impl.logger.Errorw("error in CSGlobalAddUpdate", "err", err)
12298
return nil, err
12399
}
124-
var resourceName string
125-
if len(configMapRequest.ConfigData) > 0 && configMapRequest.ConfigData[0] != nil {
126-
resourceName = configMapRequest.ConfigData[0].Name
127-
}
128-
configProperty := &bean.ConfigNameAndType{
129-
Name: resourceName,
130-
Type: bean.CS,
131-
}
132-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, configMapRequest, isSuperAdmin, userEmail)
133-
if err != nil {
134-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
135-
return nil, err
136-
}
100+
137101
return resp, nil
138102
}
139103

@@ -143,19 +107,7 @@ func (impl *DraftAwareConfigServiceImpl) CSEnvironmentAddUpdate(ctx context.Cont
143107
impl.logger.Errorw("error in CSGlobalAddUpdate", "err", err)
144108
return nil, err
145109
}
146-
var resourceName string
147-
if len(configMapRequest.ConfigData) > 0 && configMapRequest.ConfigData[0] != nil {
148-
resourceName = configMapRequest.ConfigData[0].Name
149-
}
150-
configProperty := &bean.ConfigNameAndType{
151-
Name: resourceName,
152-
Type: bean.CS,
153-
}
154-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, configMapRequest, isSuperAdmin, userEmail)
155-
if err != nil {
156-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
157-
return nil, err
158-
}
110+
159111
return resp, nil
160112

161113
}
@@ -166,15 +118,7 @@ func (impl *DraftAwareConfigServiceImpl) CMGlobalDelete(ctx context.Context, nam
166118
impl.logger.Errorw("service err, CMGlobalDelete", "appId", deleteReq.AppId, "id", deleteReq.Id, "name", name, "err", err)
167119
return false, err
168120
}
169-
configProperty := &bean.ConfigNameAndType{
170-
Name: name,
171-
Type: bean.CM,
172-
}
173-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, deleteReq, isSuperAdmin, userEmail)
174-
if err != nil {
175-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
176-
return false, err
177-
}
121+
178122
return resp, nil
179123
}
180124

@@ -184,15 +128,7 @@ func (impl *DraftAwareConfigServiceImpl) CMEnvironmentDelete(ctx context.Context
184128
impl.logger.Errorw("service err, CMEnvironmentDelete", "appId", deleteReq.AppId, "envId", deleteReq.EnvironmentId, "id", deleteReq.Id, "err", err)
185129
return false, err
186130
}
187-
configProperty := &bean.ConfigNameAndType{
188-
Name: name,
189-
Type: bean.CM,
190-
}
191-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, deleteReq, isSuperAdmin, userEmail)
192-
if err != nil {
193-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
194-
return false, err
195-
}
131+
196132
return resp, nil
197133
}
198134

@@ -202,15 +138,7 @@ func (impl *DraftAwareConfigServiceImpl) CSGlobalDelete(ctx context.Context, nam
202138
impl.logger.Errorw("service err, CSGlobalDelete", "appId", deleteReq.AppId, "id", deleteReq.Id, "name", name, "err", err)
203139
return false, err
204140
}
205-
configProperty := &bean.ConfigNameAndType{
206-
Name: name,
207-
Type: bean.CS,
208-
}
209-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, deleteReq, isSuperAdmin, userEmail)
210-
if err != nil {
211-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
212-
return false, err
213-
}
141+
214142
return resp, nil
215143
}
216144

@@ -220,15 +148,7 @@ func (impl *DraftAwareConfigServiceImpl) CSEnvironmentDelete(ctx context.Context
220148
impl.logger.Errorw("service err, CSEnvironmentDelete", "appId", deleteReq.AppId, "id", deleteReq.Id, "name", name, "err", err)
221149
return false, err
222150
}
223-
configProperty := &bean.ConfigNameAndType{
224-
Name: name,
225-
Type: bean.CS,
226-
}
227-
err = impl.performExpressEditActionsOnCmCsForExceptionUser(ctx, configProperty, deleteReq, isSuperAdmin, userEmail)
228-
if err != nil {
229-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
230-
return false, err
231-
}
151+
232152
return resp, nil
233153
}
234154

@@ -238,16 +158,7 @@ func (impl *DraftAwareConfigServiceImpl) Create(ctx context.Context, templateReq
238158
impl.logger.Errorw("error in creating base deployment template", "appId", templateRequest.AppId, "err", err)
239159
return nil, err
240160
}
241-
deplConfigMetadata := &bean.DeploymentConfigMetadata{
242-
AppId: templateRequest.AppId,
243-
EnvId: -1,
244-
ResourceName: "",
245-
}
246-
err = impl.performExpressEditActionsOnDeplTemplateForExceptionUser(ctx, deplConfigMetadata, false, isSuperAdmin, userEmail)
247-
if err != nil {
248-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
249-
return nil, err
250-
}
161+
251162
return resp, nil
252163
}
253164

@@ -257,16 +168,7 @@ func (impl *DraftAwareConfigServiceImpl) UpdateAppOverride(ctx context.Context,
257168
impl.logger.Errorw("error in updating base deployment template", "chartId", templateRequest.Id, "appId", templateRequest.AppId, "err", err)
258169
return nil, err
259170
}
260-
deplConfigMetadata := &bean.DeploymentConfigMetadata{
261-
AppId: templateRequest.AppId,
262-
EnvId: -1,
263-
ResourceName: "",
264-
}
265-
err = impl.performExpressEditActionsOnDeplTemplateForExceptionUser(ctx, deplConfigMetadata, false, isSuperAdmin, userEmail)
266-
if err != nil {
267-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
268-
return nil, err
269-
}
171+
270172
return resp, nil
271173
}
272174

@@ -276,16 +178,7 @@ func (impl *DraftAwareConfigServiceImpl) UpdateEnvironmentProperties(ctx context
276178
impl.logger.Errorw("error in creating/updating env level deployment template", "appId", propertiesRequest.AppId, "envId", propertiesRequest.EnvironmentId, "err", err)
277179
return nil, err
278180
}
279-
deplConfigMetadata := &bean.DeploymentConfigMetadata{
280-
AppId: propertiesRequest.AppId,
281-
EnvId: propertiesRequest.EnvironmentId,
282-
ResourceName: "",
283-
}
284-
err = impl.performExpressEditActionsOnDeplTemplateForExceptionUser(ctx, deplConfigMetadata, false, isSuperAdmin, userEmail)
285-
if err != nil {
286-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
287-
return nil, err
288-
}
181+
289182
return resp, nil
290183
}
291184

@@ -295,16 +188,7 @@ func (impl *DraftAwareConfigServiceImpl) ResetEnvironmentProperties(ctx context.
295188
impl.logger.Errorw("service err, ResetEnvironmentProperties", "chartEnvConfigOverrideId", propertiesRequest.Id, "userId", propertiesRequest.UserId, "err", err)
296189
return false, err
297190
}
298-
deplConfigMetadata := &bean.DeploymentConfigMetadata{
299-
AppId: propertiesRequest.AppId,
300-
EnvId: propertiesRequest.EnvironmentId,
301-
ResourceName: "",
302-
}
303-
err = impl.performExpressEditActionsOnDeplTemplateForExceptionUser(ctx, deplConfigMetadata, false, isSuperAdmin, userEmail)
304-
if err != nil {
305-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
306-
return false, err
307-
}
191+
308192
return isSuccess, nil
309193
}
310194

@@ -314,15 +198,6 @@ func (impl *DraftAwareConfigServiceImpl) CreateEnvironmentPropertiesAndBaseIfNee
314198
impl.logger.Errorw("error, CreateEnvironmentPropertiesAndBaseIfNeeded", "appId", environmentProperties.AppId, "req", environmentProperties, "err", err)
315199
return nil, err
316200
}
317-
deplConfigMetadata := &bean.DeploymentConfigMetadata{
318-
AppId: environmentProperties.AppId,
319-
EnvId: environmentProperties.EnvironmentId,
320-
ResourceName: "",
321-
}
322-
err = impl.performExpressEditActionsOnDeplTemplateForExceptionUser(ctx, deplConfigMetadata, false, isSuperAdmin, userEmail)
323-
if err != nil {
324-
impl.logger.Errorw("error in performing express edit actions if user is exception", "err", err)
325-
return nil, err
326-
}
201+
327202
return resp, nil
328203
}

‎pkg/pipeline/draftAwareConfigService/DraftAwareConfigService_ent.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)