Rename resourceGetter to remoteTargetGetter for readability

kubernetes-sigs · Mar 24, 2020 · a0e7abb · a0e7abb
1 parent 51b29d7
commit a0e7abb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 112 deletions.
diff --git a/api/loader/fileloader.go b/api/loader/fileloader.go
@@ -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 {

diff --git a/api/loader/loader.go b/api/loader/loader.go
@@ -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)

diff --git a/api/loader/resource.go b/api/loader/resource.go