refactor GlobusLogin function for simpler return signature

cmd/cliutils/globusLogin.go

@@ -10,7 +10,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-type globusConfig struct {
+type GlobusConfig struct {
 	ClientID              string   `yaml:"client-id"`
 	ClientSecret          string   `yaml:"client-secret,omitempty"`
 	RedirectURL           string   `yaml:"redirect-url"`
@@ -21,16 +21,15 @@ type globusConfig struct {
 	DestinationPrefixPath string   `yaml:"destination-prefix-path,omitempty"`
 }
 
-func GlobusLogin(confPath string) (gClient globus.GlobusClient, srcCollection string, srcPrefixPath string, destCollection string, destPrefixPath string, err error) {
+func GlobusLogin(confPath string) (gClient globus.GlobusClient, gConfig GlobusConfig, err error) {
 	// read in config
 	data, err := os.ReadFile(confPath)
 	if err != nil {
-		return globus.GlobusClient{}, "", "", "", "", fmt.Errorf("can't read globus config: %v", err)
+		return globus.GlobusClient{}, GlobusConfig{}, fmt.Errorf("can't read globus config: %v", err)
 	}
-	var gConfig globusConfig
 	err = yaml.Unmarshal(data, &gConfig)
 	if err != nil {
-		return globus.GlobusClient{}, "", "", "", "", fmt.Errorf("can't unmarshal globus config: %v", err)
+		return globus.GlobusClient{}, GlobusConfig{}, fmt.Errorf("can't unmarshal globus config: %v", err)
 	}
 
 	// config setup
@@ -46,13 +45,13 @@ func GlobusLogin(confPath string) (gClient globus.GlobusClient, srcCollection st
 	// negotiate token and create client
 	var code string
 	if _, err := fmt.Scan(&code); err != nil {
-		return globus.GlobusClient{}, "", "", "", "", err
+		return globus.GlobusClient{}, GlobusConfig{}, err
 	}
 	tok, err := clientConfig.Exchange(ctx, code, oauth2.VerifierOption(verifier))
 	if err != nil {
-		return globus.GlobusClient{}, "", "", "", "", fmt.Errorf("oauth2 exchange failed: %v", err)
+		return globus.GlobusClient{}, GlobusConfig{}, fmt.Errorf("oauth2 exchange failed: %v", err)
 	}
 
 	// return globus client
-	return globus.HttpClientToGlobusClient(clientConfig.Client(ctx, tok)), gConfig.SourceCollection, gConfig.SourcePrefixPath, gConfig.DestinationCollection, gConfig.DestinationPrefixPath, nil
+	return globus.HttpClientToGlobusClient(clientConfig.Client(ctx, tok)), gConfig, nil
 }

cmd/commands/datasetIngestor.go

@@ -91,7 +91,7 @@ For Windows you need instead to specify -user username:password on the command l
 
 		// globus specific vars (if needed)
 		var globusClient globus.GlobusClient
-		var srcCollection, srcPrefixPath, destCollection, destPrefixPath string
+		var gConfig cliutils.GlobusConfig
 
 		switch transferType {
 		case Ssh:
@@ -109,7 +109,7 @@ For Windows you need instead to specify -user username:password on the command l
 				globusConfigPath = filepath.Join(filepath.Dir(execPath), "globus.yaml")
 			}
 
-			globusClient, srcCollection, srcPrefixPath, destCollection, destPrefixPath, err = cliutils.GlobusLogin(globusConfigPath)
+			globusClient, gConfig, err = cliutils.GlobusLogin(globusConfigPath)
 			if err != nil {
 				log.Fatalln("couldn't create globus client:", err)
 			}
@@ -449,10 +449,10 @@ For Windows you need instead to specify -user username:password on the command l
 						},
 						GlobusParams: cliutils.GlobusParams{
 							GlobusClient:   globusClient,
-							SrcCollection:  srcCollection,
-							SrcPrefixPath:  srcPrefixPath,
-							DestCollection: destCollection,
-							DestPrefixPath: destPrefixPath,
+							SrcCollection:  gConfig.SourceCollection,
+							SrcPrefixPath:  gConfig.SourcePrefixPath,
+							DestCollection: gConfig.DestinationCollection,
+							DestPrefixPath: gConfig.DestinationPrefixPath,
 							Filelist:       filePathList,
 							IsSymlinkList:  isSymlinkList,
 						},

cmd/commands/globusCheckTransfer.go

@@ -136,7 +136,7 @@ For further help see "` + MANUAL + `"`,
 			user, _ = authenticate(RealAuthenticator{}, client, APIServer, userpass, token)
 		}
 
-		globusClient, _, srcPrefixPath, _, _, err := cliutils.GlobusLogin(globusConfigPath)
+		globusClient, gConfig, err := cliutils.GlobusLogin(globusConfigPath)
 		if err != nil {
 			log.Fatalf("Couldn't create globus client: %v\n", err)
 		}
@@ -160,7 +160,7 @@ For further help see "` + MANUAL + `"`,
 
 				// get source and dest folders
 				sourceFolder := *task.SourceBasePath
-				sourceFolder = strings.TrimPrefix(sourceFolder, srcPrefixPath)
+				sourceFolder = strings.TrimPrefix(sourceFolder, gConfig.SourcePrefixPath)
 				sourceFolder = strings.TrimSuffix(sourceFolder, "/")
 				var destFolder string
 				if !skipDestPathCheck {