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

Rename resourceGetter to remoteTargetGetter for readability

Browse Source
This commit is contained in:
Yujun Zhang
2020-03-24 10:11:50 +08:00
parent 51b29d7023
commit 04bec8ed2e
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/loader/fileloader.go
View File

@@ -97,10 +97,10 @@ type fileLoader struct {
// If this is non-nil, the files were
// obtained from the given resource
rscSpec *resourceSpec
rscSpec *remoteTargetSpec
// Used to get resources
getter resourceGetter
getter remoteTargetGetter
// Used to clean up, as needed.
cleaner func() error
@@ -134,14 +134,14 @@ func newLoaderOrDie(
log.Fatalf("unable to make loader at '%s'; %v", path, err)
}
return newLoaderAtConfirmedDir(
lr, root, fSys, nil, git.ClonerUsingGitExec, getResource)
lr, root, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
}
// newLoaderAtConfirmedDir returns a new fileLoader with given root.
func newLoaderAtConfirmedDir(
lr LoadRestrictorFunc,
root filesys.ConfirmedDir, fSys filesys.FileSystem,
referrer *fileLoader, cloner git.Cloner, getter resourceGetter) *fileLoader {
referrer *fileLoader, cloner git.Cloner, getter remoteTargetGetter) *fileLoader {
return &fileLoader{
loadRestrictor: lr,
root: root,
@@ -179,7 +179,7 @@ func (fl *fileLoader) New(path string) (ifc.Loader, error) {
return nil, fmt.Errorf("new root cannot be empty")
}
ldr, errGet := newResourceGetter(path, fl.fSys, nil, fl.cloner, fl.getter)
ldr, errGet := newLoaderAtGetter(path, fl.fSys, nil, fl.cloner, fl.getter)
if errGet == nil {
return ldr, nil
}
@@ -215,7 +215,7 @@ func (fl *fileLoader) New(path string) (ifc.Loader, error) {
// directory holding a cloned git repo.
func newLoaderAtGitClone(
repoSpec *git.RepoSpec, fSys filesys.FileSystem,
referrer *fileLoader, cloner git.Cloner, getter resourceGetter) (ifc.Loader, error) {
referrer *fileLoader, cloner git.Cloner, getter remoteTargetGetter) (ifc.Loader, error) {
cleaner := repoSpec.Cleaner(fSys)
err := cloner(repoSpec)
if err != nil {

14
api/loader/resource.go → api/loader/getter.go
View File

@@ -14,7 +14,7 @@ import (
"sigs.k8s.io/kustomize/api/internal/git"
)
type resourceSpec struct {
type remoteTargetSpec struct {
// Raw is the original resource in kustomization.yaml
Raw string
@@ -23,10 +23,10 @@ type resourceSpec struct {
}
// Getter is a function that can gets resource
type resourceGetter func(rs *resourceSpec) error
type remoteTargetGetter func(rs *remoteTargetSpec) error
func newResourceGetter(raw string, fSys filesys.FileSystem, referrer *fileLoader, cloner git.Cloner, getter resourceGetter) (ifc.Loader, error) {
rs := &resourceSpec{
func newLoaderAtGetter(raw string, fSys filesys.FileSystem, referrer *fileLoader, cloner git.Cloner, getter remoteTargetGetter) (ifc.Loader, error) {
rs := &remoteTargetSpec{
Raw: raw,
}
@@ -39,8 +39,6 @@ func newResourceGetter(raw string, fSys filesys.FileSystem, referrer *fileLoader
return nil, err
}
// TODO(yujunz): check file or directory
return &fileLoader{
loadRestrictor: RestrictionRootOnly,
// TODO(yujunz): limit to getter root
@@ -54,7 +52,7 @@ func newResourceGetter(raw string, fSys filesys.FileSystem, referrer *fileLoader
}, nil
}
func getResource(rs *resourceSpec) error {
func getRemoteTarget(rs *remoteTargetSpec) error {
var err error
rs.Dir, err = filesys.NewTmpConfirmedDir()
@@ -85,7 +83,7 @@ func getResource(rs *resourceSpec) error {
return client.Get()
}
func getNothing(rs *resourceSpec) error {
func getNothing(rs *remoteTargetSpec) error {
var err error
rs.Dir, err = filesys.NewTmpConfirmedDir()
if err != nil {

6
api/loader/loader.go
View File

@@ -22,7 +22,7 @@ func NewLoader(
lr LoadRestrictorFunc,
target string, fSys filesys.FileSystem) (ifc.Loader, error) {
ldr, errGet := newResourceGetter(target, fSys, nil, git.ClonerUsingGitExec, getResource)
ldr, errGet := newLoaderAtGetter(target, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
if errGet == nil {
return ldr, nil
}
@@ -31,12 +31,12 @@ func NewLoader(
if errGit == nil {
// The target qualifies as a remote git target.
return newLoaderAtGitClone(
repoSpec, fSys, nil, git.ClonerUsingGitExec, getResource)
repoSpec, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
}
root, errDir := demandDirectoryRoot(fSys, target)
if errDir == nil {
return newLoaderAtConfirmedDir(lr, root, fSys, nil, git.ClonerUsingGitExec, getResource), nil
return newLoaderAtConfirmedDir(lr, root, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget), nil
}
return nil, fmt.Errorf("Error creating new loader with git: %v, dir: %v, get: %v", errGit, errDir, errGet)