Update seci_ingestion_status for gocapo

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

 # Ingest Image Workflow Trigger:
 
 `iiwf_trigger` is a command line utility to initiate a workflow for a VLASS image set.
-It is not typically run by hand, but called by the [ingest_vlass_tile.sh](../../wf_framework/sh) script.
+It is not typically run by hand, but called by the ingest_vlass_tile.sh script.
 It works by making a REST call to Workspaces to start the workflow. It is recommended
 to have the `CAPO_PROFILE` environment variable set, otherwise you will need to
 manually specify the CAPO file with the calibration lookup URL.
 
 ## Usage
 ```
-Usage: iiwf_trigger -path /path/to/VLASS/image/set [-prop CAPO_PATH]
-    -path   Path to the VLASS image set
-    -prop   Path to the CAPO properties file with the calibration lookup URL (default is $CAPO_PROFILE.properties)
+Usage: iiwf_trigger -path /path/to/VLASS/image/set [-prop CAPO_PATH] [-profile CAPO_PROFILE]
+    -path   [Required] Path to a cached VLASS image set
+    -prop   [Optional] Path to the CAPO properties file, defaults to CAPO_PATH env variable
+    -profile The CAPO profile to use, defaults to CAPO_PROFILE env variable
 ```

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

@@ -7,7 +7,8 @@ workflow's results directory.
 
 ## Usage
 ```
-Usage: seci_ingestion_status -id <WF Request ID> [-prop CAPO_PATH]
-    -id   Workflow Request ID of the SECI Ingestion to inspect
-    -prop   Path to the CAPO properties file (default is $CAPO_PROFILE.properties)
+Usage: seci_ingestion_status -id <WF Request ID> [-prop CAPO_PATH] [-profile CAPO_PROFILE]
+    -id       [Required] Workflow Request Id of SECI Ingestion to inspect
+    -path     [Optional] Path to the CAPO properties file, defaults to CAPO_PATH env variable
+    -profile  The CAPO profile to use, defaults to CAPO_PROFILE env variable
 ```

apps/cli/executables/go/seci_ingestion_status/go.mod

@@ -2,4 +2,24 @@ module ssa/seci_ingestion_status
 
 go 1.18
 
-require github.com/magiconair/properties v1.8.6 // indirect
+require gitlab.nrao.edu/ssa/gocapo v0.0.0-20220922144228-05f75dd5e5cd
+
+require (
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.13.0 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
+	golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

apps/cli/executables/go/seci_ingestion_status/main.go

@@ -22,25 +22,29 @@ package main
 import (
 	"flag"
 	"fmt"
+	"gitlab.nrao.edu/ssa/gocapo/helpers"
+	"os"
 	"ssa/seci_ingestion_status/pkg/inspect"
 	"ssa/seci_ingestion_status/pkg/wf_info"
 )
 
 func main() {
-	var wf_req_id string
-	var capo_profile string
+	var wfReqId string
+	var capoProfile string
+	var capoPath string
 
-	flag.StringVar(&wf_req_id, "id", "", "Workflow Request Id of SECI Ingestion to inspect")
-	flag.StringVar(&capo_profile, "prop", "/home/casa/capo/${CAPO_PROFILE}.properties", "Path to the CAPO properties file")
+	flag.StringVar(&wfReqId, "id", "", "[Required] Workflow Request Id of SECI Ingestion to inspect")
+	flag.StringVar(&capoPath, "path", helpers.DefaultCapoPath, "[Optional] Path to the CAPO properties file, defaults to CAPO_PATH env variable")
+	flag.StringVar(&capoProfile, "profile", os.Getenv("CAPO_PROFILE"), "The CAPO profile to use, defaults to CAPO_PROFILE env variable")
 	flag.Parse()
 
 	// Make sure a wf_req_id was provided
-	if len(wf_req_id) == 0 {
+	if len(wfReqId) == 0 {
 		flag.Usage()
 		return
 	}
 
-	seci_wf := wf_info.GetSECIWorkflowInfo(wf_req_id, capo_profile)
-	status_msg := inspect.InspectSECIIngestionStatus(seci_wf)
-	fmt.Println(status_msg)
+	seciWf := wf_info.GetSECIWorkflowInfo(wfReqId, capoProfile, capoPath)
+	statusMsg := inspect.SeciIngestionStatus(seciWf)
+	fmt.Println(statusMsg)
 }

apps/cli/executables/go/seci_ingestion_status/pkg/inspect/inspect.go

@@ -57,39 +57,40 @@ func checkError(err error) {
 	}
 }
 
+//SeciIngestionStatus
 /**
  * Inspect a SECI Ingestion Workflow Request to determine status
  *
  * @param WfInfo A struct with needed workflow information
  * @return a formatted string containing the status of a given SECI Ingestion Workflow
  **/
-func InspectSECIIngestionStatus(wf_info wf.WfInfo) string {
-	var statusFile string = "ingest-result.json"
-	ingest_status := NewIngestionStatus(wf_info)
+func SeciIngestionStatus(wfInfo wf.WfInfo) string {
+	var statusFile = "ingest-result.json"
+	ingestStatus := NewIngestionStatus(wfInfo)
 
-	file_content, err := ioutil.ReadFile(fmt.Sprintf("%s/%s", wf_info.ResultsDir, statusFile))
+	fileContent, err := ioutil.ReadFile(fmt.Sprintf("%s/%s", wfInfo.ResultsDir, statusFile))
 	if errors.Is(err, os.ErrNotExist) {
-		ingest_status.Status = "Unknown"
-		return ingest_status.generateStatusMsg()
+		ingestStatus.Status = "Unknown"
+		return ingestStatus.generateStatusMsg()
 	} else {
 		checkError(err)
 	}
 
-	err = json.Unmarshal(file_content, &ingest_status)
+	err = json.Unmarshal(fileContent, &ingestStatus)
 	if err != nil {
 		log.Fatal("Error during Unmarshal(): ", err)
 	}
 
-	if ingest_status.Type == "workflow-complete" {
-		ingest_status.IsIngested = true
-		ingest_status.Status = "Ingested"
+	if ingestStatus.Type == "workflow-complete" {
+		ingestStatus.IsIngested = true
+		ingestStatus.Status = "Ingested"
 	}
 
-	return ingest_status.generateStatusMsg()
+	return ingestStatus.generateStatusMsg()
 }
 
 func (s *IngestionStatus) generateStatusMsg() string {
-	var additionalInfo string = ""
+	var additionalInfo = ""
 	if s.Status == "Unknown" {
 		additionalInfo = fmt.Sprintf("\n\nUnable to determine ingestion status. Ingestion may still be running or the ingestion workflow request may not have been created")
 	} else if !s.IsIngested {

apps/cli/executables/go/seci_ingestion_status/pkg/wf_info/wf_info.go

@@ -22,9 +22,9 @@ package wf_info
 import (
 	"encoding/json"
 	"fmt"
+	"gitlab.nrao.edu/ssa/gocapo/capo/config"
+	"io"
 	"net/http"
-
-	"github.com/magiconair/properties"
 )
 
 type WfInfo struct {
@@ -38,6 +38,7 @@ type Argument struct {
 	CachePath string `json:"cache_path"`
 }
 
+//checkError
 /**
  * Check if an error happened and panic on it if so
  *
@@ -49,54 +50,40 @@ func checkError(err error) {
 	}
 }
 
+//GetSECIWorkflowInfo
 /**
- * Pull a property from a CAPO property file
- *
- * @param capo_profile A string with a path to the CAPO property file
- * @param property_name A string with the name of the property to be returned
- * @return a string with the property value
- **/
-func getCapoProperty(capo_profile string, property_name string) string {
-	prop_file := properties.MustLoadFile(capo_profile, properties.UTF8)
-
-	property := prop_file.GetString(property_name, "")
-	if len(property) == 0 {
-		panic(fmt.Sprintf("Unable to retrieve property %s from %s", property_name, capo_profile))
-	}
-
-	return property
-}
-
-/**
- * Get Workflow info for SECI Ingestions
+ * Get Workflow info for SECI Ingestion
  *
  * @param wf_req_id A string of a workflow request id
  * @param capo_profile A string with the path to the CAPO property file used to
  * get the workflow service url
  * @return a WfInfo struct
  **/
-func GetSECIWorkflowInfo(wf_req_id string, capo_profile string) WfInfo {
-	workflow_url_prop := "edu.nrao.workspaces.WorkflowSettings.serviceUrl"
-	workflow_url := getCapoProperty(capo_profile, workflow_url_prop)
+func GetSECIWorkflowInfo(wfReqId string, capoProfile string, path string) WfInfo {
+	properties, err := config.InitConfig(capoProfile, path)
+	workflowUrl := properties.SettingsForPrefix("edu.nrao.workspaces.WorkflowSettings").GetString("serviceUrl")
 
-	workflow_endpoint := fmt.Sprintf("%s/workflows/ingest_seci/requests/%s", workflow_url, wf_req_id)
+	workflowEndpoint := fmt.Sprintf("%s/workflows/ingest_seci/requests/%s", workflowUrl, wfReqId)
 
-	resp, err := http.Get(workflow_endpoint)
+	resp, err := http.Get(workflowEndpoint)
 	checkError(err)
 
 	if resp.StatusCode != http.StatusOK {
-		panic(fmt.Sprintf("Error making GET request to URL %s, got status code %d", workflow_endpoint, resp.StatusCode))
+		panic(fmt.Sprintf("Error making GET request to URL %s, got status code %d", workflowEndpoint, resp.StatusCode))
 	}
 
-	defer resp.Body.Close()
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		checkError(err)
+	}(resp.Body)
 
-	wf_info := new(WfInfo)
-	err = json.NewDecoder(resp.Body).Decode(wf_info)
+	wfInfo := new(WfInfo)
+	err = json.NewDecoder(resp.Body).Decode(wfInfo)
 	checkError(err)
 
-	if wf_info.WfName != "ingest_seci" {
-		panic(fmt.Sprintf("The provided workflow request id %s is not an ingest_seci workflow. Cannot provide status.", wf_req_id))
+	if wfInfo.WfName != "ingest_seci" {
+		panic(fmt.Sprintf("The provided workflow request id %s is not an ingest_seci workflow. Cannot provide status.", wfReqId))
 	}
 
-	return *wf_info
+	return *wfInfo
 }