github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-27 16:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refine trait detaching

Browse Source
This commit is contained in:
zzxwill
2020-08-05 20:06:00 +08:00
parent 38b906c0f0
commit 547fdd3ff6
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/trait_bind.go
+13 -7
View File
@@ -187,19 +187,25 @@ func (o *commandOptions) DetachTrait(cmd *cobra.Command, args []string, ctx cont
}
_, _, tKind := cmdutil.GetTraitNameAliasKind(ctx, c, namespace, o.TraitAlias)
var traitDefinition corev1alpha2.TraitDefinition
for _, com := range o.AppConfig.Spec.Components {
for i, com := range o.AppConfig.Spec.Components {
traits := com.Traits
if com.ComponentName == appName {
traits := com.Traits
traitDefinitionList := cmdutil.ListTraitDefinitionsByApplicationConfiguration(o.AppConfig)
for i := 0; i < len(o.AppConfig.Spec.Components[0].Traits); i++ {
if strings.EqualFold(traitDefinitionList[i].Kind, tKind) {
o.AppConfig.Spec.Components[0].Traits = append(traits[:i], traits[i+1:]...)
i--
for j := 0; j < len(traits); j++ {
err := json.Unmarshal(traits[j].Trait.Raw, &traitDefinition)
if err != nil {
return err
}
if strings.EqualFold(traitDefinition.Kind, tKind) {
traits = append(traits[:j], traits[j+1:]...)
j--
}
}
}
o.AppConfig.Spec.Components[i].Traits = traits
}
return nil
}