Merge branch 'make-gmva-copy-to-difx' into '2.8.2-DEVELOPMENT'

Modified gmva_ingester to copy directories from the GMVA source area to the...

See merge request !1447

apps/cli/executables/go/gmva_ingester/README.md

 # gmva_ingester
 
 `gmva_ingester` is a utility that copies GMVA observation directories from the
-GMVA source directory (defined in CAPO) to the VLBI ingestion staging directory
+GMVA source directory (defined in CAPO) to the difx directory
 (also defined in CAPO). It is not meant to be run by hand, but by a workflow
 that facilitates the entire GMVA observation ingestion process.
 
@@ -9,5 +9,5 @@ that facilitates the entire GMVA observation ingestion process.
 ```
 Usage of ./gmva_ingester:
   -dir string
-        Name of the GMVA directory within the GMVA source directory to be copied to the VLBI staging directory
+        Name of the GMVA directory within the GMVA source directory to be copied to the difx directory
 ```

apps/cli/executables/go/gmva_ingester/main.go

@@ -28,7 +28,7 @@ import (
 func main()  {
     var gmvaDir string
 
-    flag.StringVar(&gmvaDir, "dir", "", "Name of the GMVA directory within the GMVA source directory to be copied to the VLBI staging directory")
+    flag.StringVar(&gmvaDir, "dir", "", "Name of the GMVA directory within the GMVA source directory to be copied to the difx directory")
     flag.Parse()
 
     if gmvaDir == "" {

apps/cli/executables/go/gmva_ingester/pkg/copy/copy_gmva.go

@@ -50,9 +50,10 @@ func CopyGmva(dir string)  {
     capoProperties, err := config.InitConfig(os.Getenv("CAPO_PROFILE"), helpers.DefaultCapoPath)
     checkError(err)
 
-    ingestionSettings := capoProperties.SettingsForPrefix("edu.nrao.workspaces.IngestionSettings")
-    gmvaSourcePath := ingestionSettings.GetString("gmvaSourceDirectory")
-    vlbiStagingPath := ingestionSettings.GetString("vlbiStagingDirectory")
+    wsIngestionSettings := capoProperties.SettingsForPrefix("edu.nrao.workspaces.IngestionSettings")
+    gmvaSourcePath := wsIngestionSettings.GetString("gmvaSourceDirectory")
+    aatIngestionSettings := capoProperties.SettingsForPrefix("archive-ingestion")
+    difxPath := aatIngestionSettings.GetString("VLBAPath")
 
     // GMVA source only copies files starting with GMVA
     gmvaSourceFiles := strings.Join([]string{gmvaSourcePath, dir, "GMVA*"}, "/")
@@ -60,15 +61,15 @@ func CopyGmva(dir string)  {
     gmvaSourcePaths, err = filepath.Glob(gmvaSourceFiles)
     checkError(err)
 
-    vlbiTargetDir := strings.Join([]string{vlbiStagingPath, dir}, "/")
+    difxDir := strings.Join([]string{difxPath, dir}, "/")
 
     // First make the directory to copy files to
-    mkdirCmd := exec.Command("mkdir", vlbiTargetDir)
+    mkdirCmd := exec.Command("mkdir", difxDir)
     err = mkdirCmd.Run()
     checkError(err)
 
     for _, path := range gmvaSourcePaths {
-        copyCmd := exec.Command("cp", "-LR", path, vlbiTargetDir)
+        copyCmd := exec.Command("cp", "-LR", path, difxDir)
         err = copyCmd.Run()
         checkError(err)
     }