@@ -48,6 +48,7 @@ import (
4848 repository4 "github.com/devtron-labs/devtron/pkg/pipeline/history/repository"
4949 "github.com/devtron-labs/devtron/pkg/variables"
5050 repository5 "github.com/devtron-labs/devtron/pkg/variables/repository"
51+ util2 "github.com/devtron-labs/devtron/util"
5152 "github.com/devtron-labs/devtron/util/rbac"
5253 jsonpatch "github.com/evanphx/json-patch"
5354 "github.com/go-pg/pg"
@@ -201,7 +202,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
201202
202203 //For ConfigMap
203204 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 )
205207 if err != nil {
206208 impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
207209 return nil , err
@@ -234,7 +236,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
234236 }
235237 //For Secret
236238 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 )
238241 if err != nil {
239242 impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
240243 return nil , err
@@ -287,7 +290,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
287290 }
288291 //For ConfigMap
289292 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 )
291295 if err != nil {
292296 impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
293297 return nil , err
@@ -322,7 +326,8 @@ func (impl BulkUpdateServiceImpl) GetBulkAppName(bulkUpdatePayload *BulkUpdatePa
322326 }
323327 //For Secret
324328 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 )
326331 if err != nil {
327332 impl .logger .Errorw ("error in fetching bulk app model for global" , "err" , err )
328333 return nil , err
0 commit comments