From d34c82c905767338e35ed1f6f589c0607b2d030e Mon Sep 17 00:00:00 2001 From: Takuro Wada Date: Tue, 25 Jun 2019 11:21:29 +0900 Subject: [PATCH] move globPatterns to edit pkg and make it public --- pkg/commands/edit/add/addpatch.go | 3 +- pkg/commands/edit/add/addresource.go | 3 +- pkg/commands/edit/add/flagsandargs.go | 3 +- pkg/commands/edit/add/util.go | 39 ------------------------- pkg/commands/edit/remove/removepatch.go | 3 +- pkg/commands/edit/remove/util.go | 38 ------------------------ pkg/commands/edit/util.go | 26 +++++++++++++++++ 7 files changed, 34 insertions(+), 81 deletions(-) delete mode 100644 pkg/commands/edit/add/util.go delete mode 100644 pkg/commands/edit/remove/util.go create mode 100644 pkg/commands/edit/util.go diff --git a/pkg/commands/edit/add/addpatch.go b/pkg/commands/edit/add/addpatch.go index abd8c4826..81a2832d6 100644 --- a/pkg/commands/edit/add/addpatch.go +++ b/pkg/commands/edit/add/addpatch.go @@ -21,6 +21,7 @@ import ( "log" "github.com/spf13/cobra" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit" "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" "sigs.k8s.io/kustomize/v3/pkg/fs" "sigs.k8s.io/kustomize/v3/pkg/patch" @@ -70,7 +71,7 @@ func (o *addPatchOptions) Complete(cmd *cobra.Command, args []string) error { // RunAddPatch runs addPatch command (do real work). func (o *addPatchOptions) RunAddPatch(fSys fs.FileSystem) error { - patches, err := globPatterns(fSys, o.patchFilePaths) + patches, err := edit.GlobPatterns(fSys, o.patchFilePaths) if err != nil { return err } diff --git a/pkg/commands/edit/add/addresource.go b/pkg/commands/edit/add/addresource.go index 6b9964475..5fba8af04 100644 --- a/pkg/commands/edit/add/addresource.go +++ b/pkg/commands/edit/add/addresource.go @@ -19,6 +19,7 @@ package add import ( "errors" "log" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit" "github.com/spf13/cobra" "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" @@ -69,7 +70,7 @@ func (o *addResourceOptions) Complete(cmd *cobra.Command, args []string) error { // RunAddResource runs addResource command (do real work). func (o *addResourceOptions) RunAddResource(fSys fs.FileSystem) error { - resources, err := globPatterns(fSys, o.resourceFilePaths) + resources, err := edit.GlobPatterns(fSys, o.resourceFilePaths) if err != nil { return err } diff --git a/pkg/commands/edit/add/flagsandargs.go b/pkg/commands/edit/add/flagsandargs.go index 75fbb4f6e..c4372f6c7 100644 --- a/pkg/commands/edit/add/flagsandargs.go +++ b/pkg/commands/edit/add/flagsandargs.go @@ -18,6 +18,7 @@ package add import ( "fmt" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit" "strings" "sigs.k8s.io/kustomize/v3/pkg/fs" @@ -85,7 +86,7 @@ func (a *flagsAndArgs) ExpandFileSource(fSys fs.FileSystem) error { } else { patterns = append(patterns, s[0]) } - result, err := globPatterns(fSys, patterns) + result, err := edit.GlobPatterns(fSys, patterns) if err != nil { return err } diff --git a/pkg/commands/edit/add/util.go b/pkg/commands/edit/add/util.go deleted file mode 100644 index 56cafa95b..000000000 --- a/pkg/commands/edit/add/util.go +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 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 add - -import ( - "log" - - "sigs.k8s.io/kustomize/v3/pkg/fs" -) - -func globPatterns(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 -} diff --git a/pkg/commands/edit/remove/removepatch.go b/pkg/commands/edit/remove/removepatch.go index 224aeffc9..f2bf56c27 100644 --- a/pkg/commands/edit/remove/removepatch.go +++ b/pkg/commands/edit/remove/removepatch.go @@ -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 } diff --git a/pkg/commands/edit/remove/util.go b/pkg/commands/edit/remove/util.go deleted file mode 100644 index c35f63954..000000000 --- a/pkg/commands/edit/remove/util.go +++ /dev/null @@ -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 -} diff --git a/pkg/commands/edit/util.go b/pkg/commands/edit/util.go new file mode 100644 index 000000000..90f124461 --- /dev/null +++ b/pkg/commands/edit/util.go @@ -0,0 +1,26 @@ +// Copyright 2019 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package edit + +import ( + "log" + + "sigs.k8s.io/kustomize/v3/pkg/fs" +) + +func GlobPatterns(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 +}