Skip to content

Commit c125f0b

Browse files
Merge pull request #6368 from devtron-labs/eso-clone-fix-from-main
fix: fix for while cloning app or workflow when external secret is present in any pipeline then that pipeline is not cloned
2 parents 59d2a66 + 93c99f7 commit c125f0b

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

pkg/appClone/AppCloneService.go

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -548,19 +548,24 @@ func (impl *AppCloneServiceImpl) configDataClone(cfData []*bean3.ConfigData) []*
548548
var copiedData []*bean3.ConfigData
549549
for _, refdata := range cfData {
550550
data := &bean3.ConfigData{
551-
Name: refdata.Name,
552-
Type: refdata.Type,
553-
External: refdata.External,
554-
MountPath: refdata.MountPath,
555-
Data: refdata.Data,
556-
DefaultData: refdata.DefaultData,
557-
DefaultMountPath: refdata.DefaultMountPath,
558-
Global: refdata.Global,
559-
ExternalSecretType: refdata.ExternalSecretType,
560-
FilePermission: refdata.FilePermission,
561-
SubPath: refdata.SubPath,
562-
ESOSubPath: refdata.ESOSubPath,
563-
MergeStrategy: refdata.MergeStrategy,
551+
Name: refdata.Name,
552+
Type: refdata.Type,
553+
External: refdata.External,
554+
MountPath: refdata.MountPath,
555+
Data: refdata.Data,
556+
DefaultData: refdata.DefaultData,
557+
DefaultMountPath: refdata.DefaultMountPath,
558+
Global: refdata.Global,
559+
ExternalSecretType: refdata.ExternalSecretType,
560+
FilePermission: refdata.FilePermission,
561+
SubPath: refdata.SubPath,
562+
ESOSubPath: refdata.ESOSubPath,
563+
MergeStrategy: refdata.MergeStrategy,
564+
ESOSecretData: refdata.ESOSecretData,
565+
DefaultESOSecretData: refdata.DefaultESOSecretData,
566+
ExternalSecret: refdata.ExternalSecret,
567+
DefaultExternalSecret: refdata.DefaultExternalSecret,
568+
RoleARN: refdata.RoleARN,
564569
}
565570
copiedData = append(copiedData, data)
566571
}

0 commit comments

Comments
 (0)