kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Separate functions for RunnAddLabel and RunAddAnnotation

Browse Source
This commit is contained in:
guineveresaenger
2018-08-15 03:51:56 -07:00
parent 3b644474c4
commit 524d593c5c
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pkg/commands/addmetadata.go
View File

@@ -63,7 +63,7 @@ func newCmdAddAnnotation(fsys fs.FileSystem) *cobra.Command {
if err != nil { if err != nil {
return err return err
} }
return o.RunAddMetadata(fsys, annotation) return o.RunAddAnnotation(fsys, annotation)
}, },
} }
return cmd return cmd
@@ -83,7 +83,7 @@ func newCmdAddLabel(fsys fs.FileSystem) *cobra.Command {
if err != nil { if err != nil {
return err return err
} }
return o.RunAddMetadata(fsys, label) return o.RunAddLabel(fsys, label)
}, },
} }
return cmd return cmd
@@ -118,33 +118,22 @@ func (o *addMetadataOptions) Validate(args []string, k KindOfAdd) error {
return nil return nil
} }
// RunAddMetadata runs addLabel and addAnnotation commands (do real work). // RunAddAnnotation runs addAnnotation command, doing the real work.
func (o *addMetadataOptions) RunAddMetadata(fsys fs.FileSystem, k KindOfAdd) error { func (o *addMetadataOptions) RunAddAnnotation(fsys fs.FileSystem, k KindOfAdd) error {
mf, err := newKustomizationFile(constants.KustomizationFileName, fsys) mf, err := newKustomizationFile(constants.KustomizationFileName, fsys)
if err != nil { if err != nil {
return err return err
} }
m, err := mf.read() m, err := mf.read()
if err != nil { if err != nil {
return err return err
} }
if k == label && m.CommonLabels == nil { if m.CommonAnnotations == nil {
m.CommonLabels = make(map[string]string)
}
if k == annotation && m.CommonAnnotations == nil {
m.CommonAnnotations = make(map[string]string) m.CommonAnnotations = make(map[string]string)
} }
for key, value := range o.metadata { for key, value := range o.metadata {
if k == label {
if _, ok := m.CommonLabels[key]; ok {
return fmt.Errorf("%s %s already in kustomization file", k, key)
}
m.CommonLabels[key] = value
}
if k == annotation { if k == annotation {
if _, ok := m.CommonAnnotations[key]; ok { if _, ok := m.CommonAnnotations[key]; ok {
return fmt.Errorf("%s %s already in kustomization file", k, key) return fmt.Errorf("%s %s already in kustomization file", k, key)
@@ -152,6 +141,29 @@ func (o *addMetadataOptions) RunAddMetadata(fsys fs.FileSystem, k KindOfAdd) err
m.CommonAnnotations[key] = value m.CommonAnnotations[key] = value
} }
} }
return mf.write(m)
}
// RunAddLabel runs addLabel command, doing the real work.
func (o *addMetadataOptions) RunAddLabel(fsys fs.FileSystem, k KindOfAdd) error {
mf, err := newKustomizationFile(constants.KustomizationFileName, fsys)
if err != nil {
return err
}
m, err := mf.read()
if err != nil {
return err
}
if m.CommonLabels == nil {
m.CommonLabels = make(map[string]string)
}
for key, value := range o.metadata {
if _, ok := m.CommonLabels[key]; ok {
return fmt.Errorf("%s %s already in kustomization file", k, key)
}
m.CommonLabels[key] = value
}
return mf.write(m) return mf.write(m)
} }