chore: fix refs in variablefinders

Author: GavinPJK

Diff for: pkg/cmd/variables/variables.go

@@ -146,7 +146,7 @@ func (o *Options) Validate() error {
 		o.GitClient = cli.NewCLIClient("", o.CommandRunner)
 	}
 	if o.Requirements == nil {
-		o.Requirements, err = variablefinders.FindRequirements(o.GitClient, o.JXClient, o.Namespace, o.Dir, o.Owner, o.Repository, o.GitCloneType, o.GitSparsePatterns)
+		o.Requirements, err = variablefinders.FindRequirements(o.GitClient, o.JXClient, o.Namespace, o.Dir, o.Owner, o.Repository, o.GitCloneType, o.GitSparsePatterns...)
 		if err != nil {
 			return errors.Wrapf(err, "failed to load requirements")
 		}

Diff for: pkg/variablefinders/requirements.go

@@ -12,8 +12,8 @@ import (
 )
 
 // FindRequirements finds the requirements from the dev Environment CRD
-func FindRequirements(g gitclient.Interface, jxClient jxc.Interface, ns, dir, owner, repo, cloneType string, sparseCheckoutPatterns []string) (*jxcore.RequirementsConfig, error) {
-	settings, clusterDir, err := GetSettings(g, jxClient, ns, dir, owner, repo, cloneType, sparseCheckoutPatterns)
+func FindRequirements(g gitclient.Interface, jxClient jxc.Interface, ns, dir, owner, repo, cloneType string, sparseCheckoutPatterns ...string) (*jxcore.RequirementsConfig, error) {
+	settings, clusterDir, err := GetSettings(g, jxClient, ns, dir, owner, repo, cloneType, sparseCheckoutPatterns...)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get settings")
 	}
@@ -63,7 +63,7 @@ func FindRequirements(g gitclient.Interface, jxClient jxc.Interface, ns, dir, ow
 }
 
 // GetSettings mergers and returns the settings from .jx/gitops/source-config.yaml in the cluster repo and .jx/settings.yaml in the current directory
-func GetSettings(g gitclient.Interface, jxClient jxc.Interface, ns, dir, owner, repo, cloneType string, sparseCheckoutPatterns []string) (*jxcore.Settings, string, error) {
+func GetSettings(g gitclient.Interface, jxClient jxc.Interface, ns, dir, owner, repo, cloneType string, sparseCheckoutPatterns ...string) (*jxcore.Settings, string, error) {
 	settings, err := requirements.LoadSettings(dir, true)
 	if err != nil {
 		return nil, "", errors.Wrapf(err, "failed to load settings")
@@ -93,8 +93,8 @@ func GetSettings(g gitclient.Interface, jxClient jxc.Interface, ns, dir, owner,
 	}
 	var clusterDir string
 	if cloneType == "shallow" || cloneType == "sparse" {
-		clusterDir, err = requirements.CloneClusterRepoSparse(g, gitURL, cloneType, sparseCheckoutPatterns)
-	} else if cloneType == "full" {
+		clusterDir, err = requirements.CloneClusterRepoSparse(g, gitURL, cloneType, sparseCheckoutPatterns...)
+	} else if cloneType == "full" || cloneType == "" {
 		clusterDir, err = requirements.CloneClusterRepo(g, gitURL)
 	} else {
 		return nil, "", errors.Errorf("unknown cloneType %s", cloneType)
@@ -103,7 +103,7 @@ func GetSettings(g gitclient.Interface, jxClient jxc.Interface, ns, dir, owner,
 		return nil, "", err
 	}
 
-	// Handle merging settings as before
+	// lets see if we have organisation settings
 	srcConfig, err := sourceconfigs.LoadSourceConfig(clusterDir, true)
 	if err != nil {
 		return nil, clusterDir, errors.Wrapf(err, "failed to load source configs")

Diff for: pkg/variablefinders/requirements_test.go

@@ -35,6 +35,9 @@ func TestFindRequirements(t *testing.T) {
 	owner := "myorg"
 	repo := "somerepo"
 
+	cloneType := "full"
+	sparseCheckoutPatterns := ""
+
 	testCases := []struct {
 		path        string
 		expectError bool
@@ -85,7 +88,7 @@ func TestFindRequirements(t *testing.T) {
 		}
 
 		g := cli.NewCLIClient("git", runner.Run)
-		requirements, err := variablefinders.FindRequirements(g, jxClient, ns, dir, owner, repo)
+		requirements, err := variablefinders.FindRequirements(g, jxClient, ns, dir, owner, repo, cloneType, sparseCheckoutPatterns)
 
 		if tc.expectError {
 			require.Error(t, err, "expected error for %s", name)