Skip to content
Snippets Groups Projects

Catch up with Main

Merged Charlotte Hausman requested to merge conflict_check into 2.8.2-DEVELOPMENT
44 files
+ 1449
267
Compare changes
  • Side-by-side
  • Inline
Files
44
@@ -26,6 +26,7 @@ import (
"io"
"io/ioutil"
"net/http"
"net/url"
"path/filepath"
)
@@ -33,11 +34,16 @@ type calibrationInfo struct {
Locator string `json:"locator"`
}
//CapoInput
/**
* struct for holding CAPO information
*/
type CapoInput struct {
CapoPath string
CapoProfile string
}
//checkError
/**
* Check if an error happened and panic on it if so
*
@@ -79,7 +85,7 @@ func GetCalibrationLocator(imgSetPath string, input CapoInput) string {
imgSet := filepath.Base(imgSetPath)
// Make the REST call
lookupUrl := locatorEndpoint + imgSet
lookupUrl := locatorEndpoint + url.QueryEscape(imgSet)
resp, err := http.Get(lookupUrl)
checkError(err)
Loading