@@ -48,6 +48,7 @@ import (
48
48
repository4 "github.com/devtron-labs/devtron/pkg/pipeline/history/repository"
49
49
"github.com/devtron-labs/devtron/pkg/variables"
50
50
repository5 "github.com/devtron-labs/devtron/pkg/variables/repository"
51
+ util2 "github.com/devtron-labs/devtron/util"
51
52
"github.com/devtron-labs/devtron/util/rbac"
52
53
jsonpatch "github.com/evanphx/json-patch"
53
54
"github.com/go-pg/pg"
@@ -201,7 +202,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
201
202
202
203
//For ConfigMap
203
204
if bulkUpdatePayload .ConfigMap != nil && bulkUpdatePayload .ConfigMap .Spec != nil && len (bulkUpdatePayload .ConfigMap .Spec .Names ) != 0 {
204
- configMapAppModels , err := impl .bulkUpdateRepository .FindCMBulkAppModelForGlobal (appNameIncludes , appNameExcludes , bulkUpdatePayload .ConfigMap .Spec .Names )
205
+ cmNames := util2 .GetCopyByValueObject (bulkUpdatePayload .ConfigMap .Spec .Names )
206
+ configMapAppModels , err := impl .bulkUpdateRepository .FindCMBulkAppModelForGlobal (appNameIncludes , appNameExcludes , cmNames )
205
207
if err != nil {
206
208
impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
207
209
return nil , err
@@ -234,7 +236,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
234
236
}
235
237
//For Secret
236
238
if bulkUpdatePayload .Secret != nil && bulkUpdatePayload .Secret .Spec != nil && len (bulkUpdatePayload .Secret .Spec .Names ) != 0 {
237
- secretAppModels , err := impl .bulkUpdateRepository .FindSecretBulkAppModelForGlobal (appNameIncludes , appNameExcludes , bulkUpdatePayload .Secret .Spec .Names )
239
+ secretNames := util2 .GetCopyByValueObject (bulkUpdatePayload .Secret .Spec .Names )
240
+ secretAppModels , err := impl .bulkUpdateRepository .FindSecretBulkAppModelForGlobal (appNameIncludes , appNameExcludes , secretNames )
238
241
if err != nil {
239
242
impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
240
243
return nil , err
@@ -287,7 +290,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
287
290
}
288
291
//For ConfigMap
289
292
if bulkUpdatePayload .ConfigMap != nil && bulkUpdatePayload .ConfigMap .Spec != nil && len (bulkUpdatePayload .ConfigMap .Spec .Names ) != 0 {
290
- configMapEnvModels , err := impl .bulkUpdateRepository .FindCMBulkAppModelForEnv (appNameIncludes , appNameExcludes , envId , bulkUpdatePayload .ConfigMap .Spec .Names )
293
+ cmNames := util2 .GetCopyByValueObject (bulkUpdatePayload .ConfigMap .Spec .Names )
294
+ configMapEnvModels , err := impl .bulkUpdateRepository .FindCMBulkAppModelForEnv (appNameIncludes , appNameExcludes , envId , cmNames )
291
295
if err != nil {
292
296
impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
293
297
return nil , err
@@ -322,7 +326,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
322
326
}
323
327
//For Secret
324
328
if bulkUpdatePayload .Secret != nil && bulkUpdatePayload .Secret .Spec != nil && len (bulkUpdatePayload .Secret .Spec .Names ) != 0 {
325
- secretEnvModels , err := impl .bulkUpdateRepository .FindSecretBulkAppModelForEnv (appNameIncludes , appNameExcludes , envId , bulkUpdatePayload .Secret .Spec .Names )
329
+ secretNames := util2 .GetCopyByValueObject (bulkUpdatePayload .Secret .Spec .Names )
330
+ secretEnvModels , err := impl .bulkUpdateRepository .FindSecretBulkAppModelForEnv (appNameIncludes , appNameExcludes , envId , secretNames )
326
331
if err != nil {
327
332
impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
328
333
return nil , err
0 commit comments