move globPatterns to edit pkg and make it public

This commit is contained in:
Takuro Wada
2019-06-25 11:21:29 +09:00
parent f11d083b0a
commit d34c82c905
7 changed files with 34 additions and 81 deletions

View File

@@ -5,6 +5,7 @@ package remove
import (
"log"
"sigs.k8s.io/kustomize/v3/pkg/commands/edit"
"github.com/pkg/errors"
"github.com/spf13/cobra"
@@ -58,7 +59,7 @@ func (o *removePatchOptions) Complete(cmd *cobra.Command, args []string) error {
// RunRemovePatch runs removePatch command (do real work).
func (o *removePatchOptions) RunRemovePatch(fSys fs.FileSystem) error {
patches, err := globPatternsFS(fSys, o.patchFilePaths)
patches, err := edit.GlobPatterns(fSys, o.patchFilePaths)
if err != nil {
return err
}

View File

@@ -1,38 +0,0 @@
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package remove
import (
"log"
"sigs.k8s.io/kustomize/v3/pkg/fs"
)
func globPatternsFS(fsys fs.FileSystem, patterns []string) ([]string, error) {
var result []string
for _, pattern := range patterns {
files, err := fsys.Glob(pattern)
if err != nil {
return nil, err
}
if len(files) == 0 {
log.Printf("%s has no match", pattern)
continue
}
result = append(result, files...)
}
return result, nil
}